Dolibarr / dolibarr

htdocs/api/class/api.class.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Luracast\Restler\Restler;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Defaults;
-use Luracast\Restler\Format\UploadFormat;
 
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 

Braces +17 added lines, -9 removed lines

@@ -50,7 +50,9 @@ 
     {
         global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+        if (empty($cachedir)) {
+        	$cachedir = $conf->api->dir_temp;
+        }
         Defaults::$cacheDirectory = $cachedir;
 
         $this->db = $db;
@@ -183,8 +185,7 @@ 
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
 			$featuresarray = explode("&", $resource);
-		}
-		else if (preg_match('/\|/', $resource)) {
+		} else if (preg_match('/\|/', $resource)) {
 			$featuresarray = explode("|", $resource);
 		}
 
@@ -212,8 +213,12 @@ 
 	    $counter=0;
 	    while ($i < $nb)
 	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
+	        if ($tmp[$i]=='(') {
+	        	$counter++;
+	        }
+	        if ($tmp[$i]==')') {
+	        	$counter--;
+	        }
             if ($counter < 0)
             {
 	           $error="Bad sqlfilters=".$sqlfilters;
@@ -236,16 +241,19 @@ 
 	    global $db;
 
 	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
+	    if (empty($matches[1])) {
+	    	return '';
+	    }
 	    $tmp=explode(':',$matches[1]);
-        if (count($tmp) < 3) return '';
+        if (count($tmp) < 3) {
+        	return '';
+        }
 
 	    $tmpescaped=$tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
+	    } else
 	    {
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }

Spacing +22 added lines, -22 removed lines

@@ -46,7 +46,7 @@ 
      * @param   string  $cachedir       Cache dir
      * @param   boolean $refreshCache   Update cache
      */
-    function __construct($db, $cachedir='', $refreshCache=false)
+    function __construct($db, $cachedir = '', $refreshCache = false)
     {
         global $conf, $dolibarr_main_url_root;
 
@@ -54,14 +54,14 @@ 
         Defaults::$cacheDirectory = $cachedir;
 
         $this->db = $db;
-        $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
+        $production_mode = (empty($conf->global->API_PRODUCTION_MODE) ? false : true);
         $this->r = new Restler($production_mode, $refreshCache);
 
-        $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
 
-        $urlwithouturlrootautodetect=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim(DOL_MAIN_URL_ROOT));
-        $urlwithrootautodetect=$urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
+        $urlwithouturlrootautodetect = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim(DOL_MAIN_URL_ROOT));
+        $urlwithrootautodetect = $urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
 
         $this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
         $this->r->setAPIVersion(1);
@@ -113,9 +113,9 @@ 
         unset($object->ref_next);
         unset($object->ref_int);
 
-        unset($object->projet);     // Should be fk_project
-        unset($object->project);    // Should be fk_project
-        unset($object->author);     // Should be fk_user_author
+        unset($object->projet); // Should be fk_project
+        unset($object->project); // Should be fk_project
+        unset($object->author); // Should be fk_user_author
         unset($object->timespent_old_duration);
         unset($object->timespent_id);
         unset($object->timespent_duration);
@@ -148,9 +148,9 @@ 
         unset($object->oldcopy);
 
         // If object has lines, remove $db property
-        if(isset($object->lines) && count($object->lines) > 0)  {
+        if (isset($object->lines) && count($object->lines) > 0) {
             $nboflines = count($object->lines);
-        	for ($i=0; $i < $nboflines; $i++)
+        	for ($i = 0; $i < $nboflines; $i++)
             {
                 $this->_cleanObjectDatas($object->lines[$i]);
             }
@@ -182,7 +182,7 @@ 
 	 * @param string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
 	 * @throws RestException
 	 */
-	static function _checkAccessToResource($resource, $resource_id=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid') {
+	static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid') {
 
 		// Features/modules to check
 		$featuresarray = array($resource);
@@ -194,7 +194,7 @@ 
 		}
 
 		// More subfeatures to check
-		if (! empty($feature2)) {
+		if (!empty($feature2)) {
 			$feature2 = explode("|", $feature2);
 		}
 
@@ -211,17 +211,17 @@ 
 	{
 	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
 	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp=$sqlfilters;
-	    $ok=0;
-	    $i=0; $nb=count($tmp);
-	    $counter=0;
+	    $tmp = $sqlfilters;
+	    $ok = 0;
+	    $i = 0; $nb = count($tmp);
+	    $counter = 0;
 	    while ($i < $nb)
 	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
+	        if ($tmp[$i] == '(') $counter++;
+	        if ($tmp[$i] == ')') $counter--;
             if ($counter < 0)
             {
-	           $error="Bad sqlfilters=".$sqlfilters;
+	           $error = "Bad sqlfilters=".$sqlfilters;
 	           dol_syslog($error, LOG_WARNING);
 	           return false;
             }
@@ -242,10 +242,10 @@ 
 
 	    //dol_syslog("Convert matches ".$matches[1]);
 	    if (empty($matches[1])) return '';
-	    $tmp=explode(':',$matches[1]);
+	    $tmp = explode(':', $matches[1]);
         if (count($tmp) < 3) return '';
 
-	    $tmpescaped=$tmp[2];
+	    $tmpescaped = $tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";

Indentation +151 added lines, -151 removed lines

@@ -29,52 +29,52 @@ 
 class DolibarrApi
 {
 
-    /**
-     * @var DoliDb        $db Database object
-     */
-    static protected $db;
-
-    /**
-     * @var Restler     $r	Restler object
-     */
-    var $r;
-
-    /**
-     * Constructor
-     *
-     * @param	DoliDb	$db		        Database handler
-     * @param   string  $cachedir       Cache dir
-     * @param   boolean $refreshCache   Update cache
-     */
-    function __construct($db, $cachedir='', $refreshCache=false)
-    {
-        global $conf, $dolibarr_main_url_root;
+	/**
+	 * @var DoliDb        $db Database object
+	 */
+	static protected $db;
+
+	/**
+	 * @var Restler     $r	Restler object
+	 */
+	var $r;
+
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDb	$db		        Database handler
+	 * @param   string  $cachedir       Cache dir
+	 * @param   boolean $refreshCache   Update cache
+	 */
+	function __construct($db, $cachedir='', $refreshCache=false)
+	{
+		global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
-        Defaults::$cacheDirectory = $cachedir;
+		if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+		Defaults::$cacheDirectory = $cachedir;
 
-        $this->db = $db;
-        $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
-        $this->r = new Restler($production_mode, $refreshCache);
+		$this->db = $db;
+		$production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
+		$this->r = new Restler($production_mode, $refreshCache);
 
-        $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
 
-        $urlwithouturlrootautodetect=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim(DOL_MAIN_URL_ROOT));
-        $urlwithrootautodetect=$urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
+		$urlwithouturlrootautodetect=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim(DOL_MAIN_URL_ROOT));
+		$urlwithrootautodetect=$urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
 
-        $this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
-        $this->r->setAPIVersion(1);
-    }
+		$this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
+		$this->r->setAPIVersion(1);
+	}
 
-    /**
-     * Executed method when API is called without parameter
-     *
-     * Display a short message an return a http code 200
-     *
-     * @return array
-     */
-    /* Disabled, most APIs does not share same signature for method index
+	/**
+	 * Executed method when API is called without parameter
+	 *
+	 * Display a short message an return a http code 200
+	 *
+	 * @return array
+	 */
+	/* Disabled, most APIs does not share same signature for method index
     function index()
     {
         return array(
@@ -86,81 +86,81 @@ 
     }*/
 
 
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object	Object to clean
-     * @return	array	Array of cleaned object properties
-     */
-    function _cleanObjectDatas($object) {
-
-        // Remove $db object property for object
-        unset($object->db);
-
-        // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
-        unset($object->linkedObjects);
-
-        unset($object->lines); // should be ->lines
-
-        unset($object->fields);
-
-        unset($object->oldline);
-
-        unset($object->error);
-        unset($object->errors);
-
-        unset($object->ref_previous);
-        unset($object->ref_next);
-        unset($object->ref_int);
-
-        unset($object->projet);     // Should be fk_project
-        unset($object->project);    // Should be fk_project
-        unset($object->author);     // Should be fk_user_author
-        unset($object->timespent_old_duration);
-        unset($object->timespent_id);
-        unset($object->timespent_duration);
-        unset($object->timespent_date);
-        unset($object->timespent_datehour);
-        unset($object->timespent_withhour);
-        unset($object->timespent_fk_user);
-        unset($object->timespent_note);
-
-        unset($object->statuts);
-        unset($object->statuts_short);
-        unset($object->statuts_logo);
-        unset($object->statuts_long);
-
-        unset($object->element);
-        unset($object->fk_element);
-        unset($object->table_element);
-        unset($object->table_element_line);
-        unset($object->picto);
-
-        unset($object->skip_update_total);
-        unset($object->context);
-
-        // Remove the $oldcopy property because it is not supported by the JSON
-        // encoder. The following error is generated when trying to serialize
-        // it: "Error encoding/decoding JSON: Type is not supported"
-        // Note: Event if this property was correctly handled by the JSON
-        // encoder, it should be ignored because keeping it would let the API
-        // have a very strange behavior: calling PUT and then GET on the same
-        // resource would give different results:
-        // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
-        // GET /objects/{id} -> returns object with oldcopy empty
-        unset($object->oldcopy);
-
-        // If object has lines, remove $db property
-        if(isset($object->lines) && count($object->lines) > 0)  {
-            $nboflines = count($object->lines);
-        	for ($i=0; $i < $nboflines; $i++)
-            {
-                $this->_cleanObjectDatas($object->lines[$i]);
-            }
-        }
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object	Object to clean
+	 * @return	array	Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+
+		// Remove $db object property for object
+		unset($object->db);
+
+		// Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
+		unset($object->linkedObjects);
+
+		unset($object->lines); // should be ->lines
+
+		unset($object->fields);
+
+		unset($object->oldline);
+
+		unset($object->error);
+		unset($object->errors);
+
+		unset($object->ref_previous);
+		unset($object->ref_next);
+		unset($object->ref_int);
+
+		unset($object->projet);     // Should be fk_project
+		unset($object->project);    // Should be fk_project
+		unset($object->author);     // Should be fk_user_author
+		unset($object->timespent_old_duration);
+		unset($object->timespent_id);
+		unset($object->timespent_duration);
+		unset($object->timespent_date);
+		unset($object->timespent_datehour);
+		unset($object->timespent_withhour);
+		unset($object->timespent_fk_user);
+		unset($object->timespent_note);
+
+		unset($object->statuts);
+		unset($object->statuts_short);
+		unset($object->statuts_logo);
+		unset($object->statuts_long);
+
+		unset($object->element);
+		unset($object->fk_element);
+		unset($object->table_element);
+		unset($object->table_element_line);
+		unset($object->picto);
+
+		unset($object->skip_update_total);
+		unset($object->context);
+
+		// Remove the $oldcopy property because it is not supported by the JSON
+		// encoder. The following error is generated when trying to serialize
+		// it: "Error encoding/decoding JSON: Type is not supported"
+		// Note: Event if this property was correctly handled by the JSON
+		// encoder, it should be ignored because keeping it would let the API
+		// have a very strange behavior: calling PUT and then GET on the same
+		// resource would give different results:
+		// PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+		// GET /objects/{id} -> returns object with oldcopy empty
+		unset($object->oldcopy);
+
+		// If object has lines, remove $db property
+		if(isset($object->lines) && count($object->lines) > 0)  {
+			$nboflines = count($object->lines);
+			for ($i=0; $i < $nboflines; $i++)
+			{
+				$this->_cleanObjectDatas($object->lines[$i]);
+			}
+		}
 
-        // If object has linked objects, remove $db property
-        /*
+		// If object has linked objects, remove $db property
+		/*
         if(isset($object->linkedObjects) && count($object->linkedObjects) > 0)  {
             foreach($object->linkedObjects as $type_object => $linked_object) {
                 foreach($linked_object as $object2clean) {
@@ -170,7 +170,7 @@ 
         }*/
 
 		return $object;
-    }
+	}
 
 	/**
 	 * Check user access to a resource
@@ -212,25 +212,25 @@ 
 	 */
 	function _checkFilters($sqlfilters)
 	{
-	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp=$sqlfilters;
-	    $ok=0;
-	    $i=0; $nb=count($tmp);
-	    $counter=0;
-	    while ($i < $nb)
-	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
-            if ($counter < 0)
-            {
-	           $error="Bad sqlfilters=".$sqlfilters;
-	           dol_syslog($error, LOG_WARNING);
-	           return false;
-            }
-            $i++;
-	    }
-	    return true;
+		//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+		//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
+		$tmp=$sqlfilters;
+		$ok=0;
+		$i=0; $nb=count($tmp);
+		$counter=0;
+		while ($i < $nb)
+		{
+			if ($tmp[$i]=='(') $counter++;
+			if ($tmp[$i]==')') $counter--;
+			if ($counter < 0)
+			{
+			   $error="Bad sqlfilters=".$sqlfilters;
+			   dol_syslog($error, LOG_WARNING);
+			   return false;
+			}
+			$i++;
+		}
+		return true;
 	}
 
 	/**
@@ -241,22 +241,22 @@ 
 	 */
 	static function _forge_criteria_callback($matches)
 	{
-	    global $db;
-
-	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
-	    $tmp=explode(':',$matches[1]);
-        if (count($tmp) < 3) return '';
-
-	    $tmpescaped=$tmp[2];
-	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
-	    {
-	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
-	    {
-	        $tmpescaped = $db->escape($tmpescaped);
-	    }
-	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
+		global $db;
+
+		//dol_syslog("Convert matches ".$matches[1]);
+		if (empty($matches[1])) return '';
+		$tmp=explode(':',$matches[1]);
+		if (count($tmp) < 3) return '';
+
+		$tmpescaped=$tmp[2];
+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
+		{
+			$tmpescaped = "'".$db->escape($regbis[1])."'";
+		}
+		else
+		{
+			$tmpescaped = $db->escape($tmpescaped);
+		}
+		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
 	}
 }

htdocs/api/class/api_documents.class.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  */
 
 use Luracast\Restler\RestException;
-use Luracast\Restler\Format\UploadFormat;
 
 
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';

Braces +14 added lines, -9 removed lines

@@ -109,8 +109,12 @@ 
         }
 
         $newfilecontent = '';
-        if (empty($fileencoding)) $newfilecontent = $filecontent;
-        if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+        if (empty($fileencoding)) {
+        	$newfilecontent = $filecontent;
+        }
+        if ($fileencoding == 'base64') {
+        	$newfilecontent = base64_decode($filecontent);
+        }
 
 		$original_file = dol_sanitizeFileName($filename);
 
@@ -138,10 +142,11 @@ 
     		{
     		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
     		}
-		}
-		else
+		} else
 		{
-		    if ($modulepart == 'invoice') $modulepart ='facture';
+		    if ($modulepart == 'invoice') {
+		    	$modulepart ='facture';
+		    }
 		    
 		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
     		$upload_dir = $tmp['original_file'];
@@ -174,8 +179,7 @@ 
             $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
             fclose($fhandle);
             @chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-        }
-        else
+        } else
         {
             throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
         }
@@ -195,8 +199,9 @@ 
     function _validate_file($data) {
         $result = array();
         foreach (Documents::$DOCUMENT_FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $result[$field] = $data[$field];
         }
         return $result;

Indentation +174 added lines, -174 removed lines

@@ -33,49 +33,49 @@ 
 class Documents extends DolibarrApi
 {
 
-    /**
-     * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $DOCUMENT_FIELDS = array(
-        'modulepart'
-    );
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-
-    /**
-     * Returns a document. Note that, this API is similar to using the wrapper link "documents.php" to download
-     * a file (used for internal HTML links of documents into application), but with no need to be into a logged session (no need to post the session cookie).
-     *
-     * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
-     * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
-     * @param	int		$regeneratedoc	If requested document is the main document of an object, setting this to 1 ask API to regenerate document before returning it (supported for some module_part only). It is no effect in other cases.
-     * 									Also, note that setting this to 1 nead write access on object.
-     * @return  array                   List of documents
-     *
-     * @throws 500
-     * @throws 501
-     * @throws 400
-     * @throws 401
-     * @throws 200
-     */
-    public function index($module_part, $original_file='', $regeneratedoc=0)
-    {
+	/**
+	 * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $DOCUMENT_FIELDS = array(
+		'modulepart'
+	);
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
+
+
+	/**
+	 * Returns a document. Note that, this API is similar to using the wrapper link "documents.php" to download
+	 * a file (used for internal HTML links of documents into application), but with no need to be into a logged session (no need to post the session cookie).
+	 *
+	 * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
+	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
+	 * @param	int		$regeneratedoc	If requested document is the main document of an object, setting this to 1 ask API to regenerate document before returning it (supported for some module_part only). It is no effect in other cases.
+	 * 									Also, note that setting this to 1 nead write access on object.
+	 * @return  array                   List of documents
+	 *
+	 * @throws 500
+	 * @throws 501
+	 * @throws 400
+	 * @throws 401
+	 * @throws 200
+	 */
+	public function index($module_part, $original_file='', $regeneratedoc=0)
+	{
 		global $conf;
 
 		if (empty($module_part)) {
-	            throw new RestException(400, 'bad value for parameter modulepart');
+				throw new RestException(400, 'bad value for parameter modulepart');
+		}
+		if (empty($original_file)) {
+			throw new RestException(400, 'bad value for parameter ref or subdir');
 		}
-        if (empty($original_file)) {
-            throw new RestException(400, 'bad value for parameter ref or subdir');
-        }
 
 		//--- Finds and returns the document
 		$entity=$conf->entity;
@@ -87,94 +87,94 @@ 
 
 		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
 		{
-		    throw new RestException(401);
+			throw new RestException(401);
+		}
+		if (!$accessallowed) {
+			throw new RestException(401);
+		}
+
+		// --- Generates the document
+		if ($regeneratedoc)
+		{
+			$hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
+			$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
+			$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
+
+			if ($module_part == 'facture' || $module_part == 'invoice')
+			{
+				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$this->invoice = new Facture($this->db);
+				$result = $this->invoice->fetch(0, $ref);
+				if( ! $result ) {
+					throw new RestException(404, 'Invoice not found');
+				}
+				$result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if( $result <= 0 ) {
+					throw new RestException(500, 'Error generating document');
+				}
+			}
 		}
-	    if (!$accessallowed) {
-	        throw new RestException(401);
-	    }
-
-        // --- Generates the document
-        if ($regeneratedoc)
-        {
-        	$hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
-        	$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
-        	$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
-
-        	if ($module_part == 'facture' || $module_part == 'invoice')
-        	{
-        		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        		$this->invoice = new Facture($this->db);
-        		$result = $this->invoice->fetch(0, $ref);
-        		if( ! $result ) {
-        			throw new RestException(404, 'Invoice not found');
-        		}
-        		$result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        		if( $result <= 0 ) {
-        			throw new RestException(500, 'Error generating document');
-        		}
-        	}
-        }
 
 		$filename = basename($original_file);
 		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
 
 		if (! file_exists($original_file_osencoded))
 		{
-		    throw new RestException(404, 'File not found');
+			throw new RestException(404, 'File not found');
 		}
 
 		$file_content=file_get_contents($original_file_osencoded);
-        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
-    }
-
-
-    /**
-     * Return a document.
-     *
-     * @param   int         $id          ID of document
-     * @return  array                    Array with data of file
-     *
-     * @throws RestException
-     */
-    /*
+		return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
+	}
+
+
+	/**
+	 * Return a document.
+	 *
+	 * @param   int         $id          ID of document
+	 * @return  array                    Array with data of file
+	 *
+	 * @throws RestException
+	 */
+	/*
     public function get($id) {
         return array('note'=>'xxx');
     }*/
 
 
-    /**
-     * Push a file.
-     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-     *
-     * @param   string  $filename           Name of file to create ('FA1705-0123')
-     * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
-     * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
-     * @param   string  $subdir             Subdirectory (Only if ref not provided)
-     * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
-     * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
-     * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
-     * @return  bool     				    State of copy
-     * @throws RestException
-     */
-    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
-    {
-        global $db, $conf;
-
-        /*var_dump($modulepart);
+	/**
+	 * Push a file.
+	 * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 *
+	 * @param   string  $filename           Name of file to create ('FA1705-0123')
+	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
+	 * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
+	 * @param   string  $subdir             Subdirectory (Only if ref not provided)
+	 * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
+	 * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
+	 * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
+	 * @return  bool     				    State of copy
+	 * @throws RestException
+	 */
+	public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+	{
+		global $db, $conf;
+
+		/*var_dump($modulepart);
         var_dump($filename);
         var_dump($filecontent);
         exit;*/
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
-        if (!DolibarrApiAccess::$user->rights->ecm->upload) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->ecm->upload) {
+			throw new RestException(401);
+		}
 
-        $newfilecontent = '';
-        if (empty($fileencoding)) $newfilecontent = $filecontent;
-        if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+		$newfilecontent = '';
+		if (empty($fileencoding)) $newfilecontent = $filecontent;
+		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
 
 		$original_file = dol_sanitizeFileName($filename);
 
@@ -183,37 +183,37 @@ 
 		$entity = $user->entity;
 		if ($ref)
 		{
-    		if ($modulepart == 'facture' || $modulepart == 'invoice')
-    		{
-    		    $modulepart='facture';
-    		    $object=new Facture($db);
-    		    $result = $object->fetch('', $ref);
-    		}
-
-    		if (! ($object->id > 0))
-    		{
-   		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
-    		}
-
-    		$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
-    		$upload_dir = $tmp['original_file'];
-
-    		if (empty($upload_dir) || $upload_dir == '/')
-    		{
-    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
-    		}
+			if ($modulepart == 'facture' || $modulepart == 'invoice')
+			{
+				$modulepart='facture';
+				$object=new Facture($db);
+				$result = $object->fetch('', $ref);
+			}
+
+			if (! ($object->id > 0))
+			{
+   				throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+			}
+
+			$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
+			$upload_dir = $tmp['original_file'];
+
+			if (empty($upload_dir) || $upload_dir == '/')
+			{
+				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+			}
 		}
 		else
 		{
-		    if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') $modulepart ='facture';
 
-		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
-    		$upload_dir = $tmp['original_file'];
+			$tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
+			$upload_dir = $tmp['original_file'];
 
-		    if (empty($upload_dir) || $upload_dir == '/')
-    		{
-    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
-    		}
+			if (empty($upload_dir) || $upload_dir == '/')
+			{
+				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+			}
 		}
 
 
@@ -223,46 +223,46 @@ 
 		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
 		dol_delete_file($destfiletmp);
 
-        if (!dol_is_dir($upload_dir)) {
-            throw new RestException(401,'Directory not exists : '.$upload_dir);
-        }
-
-        if (! $overwriteifexists && dol_is_file($destfile))
-        {
-            throw new RestException(500, "File with name '".$original_file."' already exists.");
-        }
-
-        $fhandle = @fopen($destfiletmp, 'w');
-        if ($fhandle)
-        {
-            $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
-            fclose($fhandle);
-            @chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-        }
-        else
-        {
-            throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
-        }
-
-        $result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-
-        return $result;
-    }
-
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    function _validate_file($data) {
-        $result = array();
-        foreach (Documents::$DOCUMENT_FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $result[$field] = $data[$field];
-        }
-        return $result;
-    }
+		if (!dol_is_dir($upload_dir)) {
+			throw new RestException(401,'Directory not exists : '.$upload_dir);
+		}
+
+		if (! $overwriteifexists && dol_is_file($destfile))
+		{
+			throw new RestException(500, "File with name '".$original_file."' already exists.");
+		}
+
+		$fhandle = @fopen($destfiletmp, 'w');
+		if ($fhandle)
+		{
+			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
+			fclose($fhandle);
+			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
+		}
+		else
+		{
+			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
+		}
+
+		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
+
+		return $result;
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	function _validate_file($data) {
+		$result = array();
+		foreach (Documents::$DOCUMENT_FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$result[$field] = $data[$field];
+		}
+		return $result;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -66,7 +66,7 @@ 
      * @throws 401
      * @throws 200
      */
-    public function index($module_part, $original_file='', $regeneratedoc=0)
+    public function index($module_part, $original_file = '', $regeneratedoc = 0)
     {
 		global $conf;
 
@@ -78,14 +78,14 @@ 
         }
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', ($regeneratedoc ? 'write' : 'read'));
 		$accessallowed              = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file              = $check_access['original_file'];
 
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+		if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
 		{
 		    throw new RestException(401);
 		}
@@ -105,26 +105,26 @@ 
         		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         		$this->invoice = new Facture($this->db);
         		$result = $this->invoice->fetch(0, $ref);
-        		if( ! $result ) {
+        		if (!$result) {
         			throw new RestException(404, 'Invoice not found');
         		}
         		$result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        		if( $result <= 0 ) {
+        		if ($result <= 0) {
         			throw new RestException(500, 'Error generating document');
         		}
         	}
         }
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 		    throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
+		$file_content = file_get_contents($original_file_osencoded);
+        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)');
     }
 
 
@@ -157,7 +157,7 @@ 
      * @return  bool     				    State of copy
      * @throws RestException
      */
-    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+    public function post($filename, $modulepart, $ref = '', $subdir = '', $filecontent = '', $fileencoding = '', $overwriteifexists = 0)
     {
         global $db, $conf;
 
@@ -166,7 +166,7 @@ 
         var_dump($filecontent);
         exit;*/
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         if (!DolibarrApiAccess::$user->rights->ecm->upload) {
             throw new RestException(401);
@@ -185,12 +185,12 @@ 
 		{
     		if ($modulepart == 'facture' || $modulepart == 'invoice')
     		{
-    		    $modulepart='facture';
-    		    $object=new Facture($db);
+    		    $modulepart = 'facture';
+    		    $object = new Facture($db);
     		    $result = $object->fetch('', $ref);
     		}
 
-    		if (! ($object->id > 0))
+    		if (!($object->id > 0))
     		{
    		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
     		}
@@ -205,7 +205,7 @@ 
 		}
 		else
 		{
-		    if ($modulepart == 'invoice') $modulepart ='facture';
+		    if ($modulepart == 'invoice') $modulepart = 'facture';
 
 		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
     		$upload_dir = $tmp['original_file'];
@@ -219,15 +219,15 @@ 
 
 		$upload_dir = dol_sanitizePathName($upload_dir);
 
-		$destfile = $upload_dir . '/' . $original_file;
-		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		$destfile = $upload_dir.'/'.$original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/'.$original_file;
 		dol_delete_file($destfiletmp);
 
         if (!dol_is_dir($upload_dir)) {
-            throw new RestException(401,'Directory not exists : '.$upload_dir);
+            throw new RestException(401, 'Directory not exists : '.$upload_dir);
         }
 
-        if (! $overwriteifexists && dol_is_file($destfile))
+        if (!$overwriteifexists && dol_is_file($destfile))
         {
             throw new RestException(500, "File with name '".$original_file."' already exists.");
         }

htdocs/societe/class/api_thirdparties.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
      * @param int		$id	Id of thirdparty
      * @param array     $request_data   Request datas
      *
-     * @return mixed
+     * @return Societe
      *
      * @url POST {id}/addCategory
      */
@@ -314,7 +314,7 @@ 
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
+	 * @param   Societe  $object    Object to clean
 	 * @return    array    Array of cleaned object properties
 	 */
 	function _cleanObjectDatas($object) {

Braces +46 added lines, -20 removed lines

@@ -107,23 +107,44 @@ 
             
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+        	$search_sale = DolibarrApiAccess::$user->id;
+        }
 
         $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+        	$sql .= ", sc.fk_soc, sc.fk_user";
+        }
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
         
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+        	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
+        // We need this table joined to the select in order to filter by sale
         $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
         $sql.= " WHERE t.fk_stcomm = st.id";
-        if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-        if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-        if ($mode == 3) $sql.= " AND t.client IN (0)";
+        if ($mode == 1) {
+        	$sql.= " AND t.client IN (1, 3)";
+        }
+        if ($mode == 2) {
+        	$sql.= " AND t.client IN (2, 3)";
+        }
+        if ($mode == 3) {
+        	$sql.= " AND t.client IN (0)";
+        }
         $sql.= ' AND t.entity IN ('.getEntity('societe').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+        	$sql.= " AND t.rowid = sc.fk_soc";
+        }
         //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-        if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        if ($socid) {
+        	$sql.= " AND t.rowid IN (".$socids.")";
+        }
+        if ($search_sale > 0) {
+        	$sql.= " AND t.rowid = sc.fk_soc";
+        }
+        // Join for the needed table to filter by sale
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -166,8 +187,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -193,8 +213,9 @@ 
       foreach($request_data as $field => $value) {
           $this->company->$field = $value;
       }
-      if ($this->company->create(DolibarrApiAccess::$user) < 0)
-          throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+      if ($this->company->create(DolibarrApiAccess::$user) < 0) {
+                throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+      }
       
       return $this->company->id;
     }
@@ -222,12 +243,15 @@ 
 		}
 
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+            	continue;
+            }
             $this->company->$field = $value;
         }
         
-        if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-            return $this->get ($id);
+        if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update')) {
+                    return $this->get ($id);
+        }
         
         return false;
     }
@@ -282,8 +306,9 @@ 
      * @url POST {id}/addCategory
      */
     function addCategory($id, $request_data = NULL) {
-        if (!isset($request_data["category_id"]))
-            throw new RestException(400, "category_id field missing");
+        if (!isset($request_data["category_id"])) {
+                    throw new RestException(400, "category_id field missing");
+        }
         $category_id = $request_data["category_id"];
 
       if(! DolibarrApiAccess::$user->rights->societe->creer) {
@@ -342,8 +367,9 @@ 
     {
         $thirdparty = array();
         foreach (Thirdparties::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $thirdparty[$field] = $data[$field];
         }
         return $thirdparty;

Indentation +275 added lines, -275 removed lines

@@ -28,32 +28,32 @@ 
  */
 class Thirdparties extends DolibarrApi
 {
-    /**
-     *
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'name'
-    );
-
-    /**
-     * @var Societe $company {@type Societe}
-     */
-    public $company;
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
+	/**
+	 *
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'name'
+	);
+
+	/**
+	 * @var Societe $company {@type Societe}
+	 */
+	public $company;
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->company = new Societe($this->db);
+		$this->company = new Societe($this->db);
 
-        if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
-            static::$FIELDS[] = 'email';
-        }
-    }
+		if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+			static::$FIELDS[] = 'email';
+		}
+	}
 
   /**
    * Get properties of a thirdparty object
@@ -62,211 +62,211 @@ 
    *
    * @param 	int 	$id ID of thirdparty
    * @return 	array|mixed data without useless information
-	 *
+   *
    * @throws 	RestException
    */
-    function get($id)
-    {
-      if(! DolibarrApiAccess::$user->rights->societe->lire) {
-        throw new RestException(401);
-      }
+	function get($id)
+	{
+	  if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		throw new RestException(401);
+	  }
 
-      $result = $this->company->fetch($id);
-      if( ! $result ) {
-          throw new RestException(404, 'Thirdparty not found');
-      }
+	  $result = $this->company->fetch($id);
+	  if( ! $result ) {
+		  throw new RestException(404, 'Thirdparty not found');
+	  }
 
-      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
+	  if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
 
 		  return $this->_cleanObjectDatas($this->company);
-    }
-
-    /**
-     * List thirdparties
-     *
-     * Get a list of thirdparties
-     *
-     * @param   string  $sortfield  Sort field
-     * @param   string  $sortorder  Sort order
-     * @param   int     $limit      Limit for list
-     * @param   int     $page       Page number
-     * @param   int     $mode       Set to 1 to show only customers
-     *                              Set to 2 to show only prospects
-     *                              Set to 3 to show only those are not customer neither prospect
-     * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array               Array of thirdparty objects
-     */
-    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $sqlfilters = '') {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        // case of external user, we force socids
-        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
-
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE t.fk_stcomm = st.id";
-        if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-        if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-        if ($mode == 3) $sql.= " AND t.client IN (0)";
-        $sql.= ' AND t.entity IN ('.getEntity('societe').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
-        //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-        if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
+	}
+
+	/**
+	 * List thirdparties
+	 *
+	 * Get a list of thirdparties
+	 *
+	 * @param   string  $sortfield  Sort field
+	 * @param   string  $sortorder  Sort order
+	 * @param   int     $limit      Limit for list
+	 * @param   int     $page       Page number
+	 * @param   int     $mode       Set to 1 to show only customers
+	 *                              Set to 2 to show only prospects
+	 *                              Set to 3 to show only those are not customer neither prospect
+	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array               Array of thirdparty objects
+	 */
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $sqlfilters = '') {
+		global $db, $conf;
+
+		$obj_ret = array();
+
+		// case of external user, we force socids
+		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
+
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
+
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+		$sql.= " WHERE t.fk_stcomm = st.id";
+		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
+		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
+		if ($mode == 3) $sql.= " AND t.client IN (0)";
+		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
+		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
+		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (! DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql.= $db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
 
 		$result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $soc_static = new Societe($db);
-                if($soc_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($soc_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'Thirdparties not found');
-        }
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$soc_static = new Societe($db);
+				if($soc_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
+		}
+		if( ! count($obj_ret)) {
+			throw new RestException(404, 'Thirdparties not found');
+		}
 		return $obj_ret;
-    }
-
-    /**
-     * Create thirdparty object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of thirdparty
-     */
-    function post($request_data = NULL)
-    {
-      if(! DolibarrApiAccess::$user->rights->societe->creer) {
-        throw new RestException(401);
-      }
-      // Check mandatory fields
-      $result = $this->_validate($request_data);
-
-      foreach($request_data as $field => $value) {
-          $this->company->$field = $value;
-      }
-      if ($this->company->create(DolibarrApiAccess::$user) < 0)
-          throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
-
-      return $this->company->id;
-    }
-
-    /**
-     * Update thirdparty
-     *
-     * @param int   $id             Id of thirdparty to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+	}
+
+	/**
+	 * Create thirdparty object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of thirdparty
+	 */
+	function post($request_data = NULL)
+	{
+	  if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		throw new RestException(401);
+	  }
+	  // Check mandatory fields
+	  $result = $this->_validate($request_data);
+
+	  foreach($request_data as $field => $value) {
+		  $this->company->$field = $value;
+	  }
+	  if ($this->company->create(DolibarrApiAccess::$user) < 0)
+		  throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+
+	  return $this->company->id;
+	}
+
+	/**
+	 * Update thirdparty
+	 *
+	 * @param int   $id             Id of thirdparty to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	function put($id, $request_data = NULL)
+	{
+		if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->company->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Thirdparty not found');
-        }
+		$result = $this->company->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Thirdparty not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->company->$field = $value;
-        }
-
-        if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-            return $this->get ($id);
-
-        return false;
-    }
-
-    /**
-     * Delete thirdparty
-     *
-     * @param int $id   Thirparty ID
-     * @return integer
-     */
-    function delete($id)
-    {
-      if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
-        throw new RestException(401);
-      }
-      $result = $this->company->fetch($id);
-      if( ! $result ) {
-          throw new RestException(404, 'Thirdparty not found');
-      }
-      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-      return $this->company->delete($id);
-    }
-
-    /**
-     * Get categories for a thirdparty
-     *
-     * @param int		$id         ID of thirdparty
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
+		foreach($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->company->$field = $value;
+		}
+
+		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
+			return $this->get ($id);
+
+		return false;
+	}
+
+	/**
+	 * Delete thirdparty
+	 *
+	 * @param int $id   Thirparty ID
+	 * @return integer
+	 */
+	function delete($id)
+	{
+	  if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+		throw new RestException(401);
+	  }
+	  $result = $this->company->fetch($id);
+	  if( ! $result ) {
+		  throw new RestException(404, 'Thirdparty not found');
+	  }
+	  if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
+	  return $this->company->delete($id);
+	}
+
+	/**
+	 * Get categories for a thirdparty
+	 *
+	 * @param int		$id         ID of thirdparty
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
@@ -286,47 +286,47 @@ 
 		}
 
 		return $result;
-    }
-
-    /**
-     * Add category to a thirdparty
-     *
-     * @param int		$id	Id of thirdparty
-     * @param array     $request_data   Request datas
-     *
-     * @return mixed
-     *
-     * @url POST {id}/addCategory
-     */
-    function addCategory($id, $request_data = NULL) {
-        if (!isset($request_data["category_id"]))
-            throw new RestException(400, "category_id field missing");
-        $category_id = $request_data["category_id"];
-
-      if(! DolibarrApiAccess::$user->rights->societe->creer) {
+	}
+
+	/**
+	 * Add category to a thirdparty
+	 *
+	 * @param int		$id	Id of thirdparty
+	 * @param array     $request_data   Request datas
+	 *
+	 * @return mixed
+	 *
+	 * @url POST {id}/addCategory
+	 */
+	function addCategory($id, $request_data = NULL) {
+		if (!isset($request_data["category_id"]))
+			throw new RestException(400, "category_id field missing");
+		$category_id = $request_data["category_id"];
+
+	  if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			  throw new RestException(401);
-      }
-
-      $result = $this->company->fetch($id);
-      if( ! $result ) {
-          throw new RestException(404, 'Thirdparty not found');
-      }
-      $category = new Categorie($this->db);
-      $result = $category->fetch($category_id);
-      if( ! $result ) {
-          throw new RestException(404, 'category not found');
-      }
-
-      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-      if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-
-      $category->add_type($this->company,'customer');
-      return $this->company;
-    }
+	  }
+
+	  $result = $this->company->fetch($id);
+	  if( ! $result ) {
+		  throw new RestException(404, 'Thirdparty not found');
+	  }
+	  $category = new Categorie($this->db);
+	  $result = $category->fetch($category_id);
+	  if( ! $result ) {
+		  throw new RestException(404, 'category not found');
+	  }
+
+	  if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
+	  if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
+
+	  $category->add_type($this->company,'customer');
+	  return $this->company;
+	}
 
 	/**
 	 * Clean sensible object datas
@@ -336,33 +336,33 @@ 
 	 */
 	function _cleanObjectDatas($object) {
 
-	    $object = parent::_cleanObjectDatas($object);
+		$object = parent::_cleanObjectDatas($object);
 
-	    unset($object->total_ht);
-	    unset($object->total_tva);
-	    unset($object->total_localtax1);
-	    unset($object->total_localtax2);
-	    unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-	    return $object;
+		return $object;
 	}
 
 	/**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Datas to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $thirdparty = array();
-        foreach (Thirdparties::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $thirdparty[$field] = $data[$field];
-        }
-        return $thirdparty;
-    }
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Datas to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	function _validate($data)
+	{
+		$thirdparty = array();
+		foreach (Thirdparties::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$thirdparty[$field] = $data[$field];
+		}
+		return $thirdparty;
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -50,7 +50,7 @@ 
 		$this->db = $db;
         $this->company = new Societe($this->db);
 
-        if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+        if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
             static::$FIELDS[] = 'email';
         }
     }
@@ -67,16 +67,16 @@ 
    */
     function get($id)
     {
-      if(! DolibarrApiAccess::$user->rights->societe->lire) {
+      if (!DolibarrApiAccess::$user->rights->societe->lire) {
         throw new RestException(401);
       }
 
       $result = $this->company->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
           throw new RestException(404, 'Thirdparty not found');
       }
 
-      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+      if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
 
@@ -98,7 +98,7 @@ 
      * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
      * @return  array               Array of thirdparty objects
      */
-    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $sqlfilters = '') {
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode = 0, $sqlfilters = '') {
         global $db, $conf;
 
         $obj_ret = array();
@@ -108,23 +108,23 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
-
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE t.fk_stcomm = st.id";
-        if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-        if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-        if ($mode == 3) $sql.= " AND t.client IN (0)";
-        $sql.= ' AND t.entity IN ('.getEntity('societe').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
+
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+        $sql .= " WHERE t.fk_stcomm = st.id";
+        if ($mode == 1) $sql .= " AND t.client IN (1, 3)";
+        if ($mode == 2) $sql .= " AND t.client IN (2, 3)";
+        if ($mode == 3) $sql .= " AND t.client IN (0)";
+        $sql .= ' AND t.entity IN ('.getEntity('societe').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
         //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-        if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        if ($socid) $sql .= " AND t.rowid IN (".$socids.")";
+        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -133,15 +133,15 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
+        $sql .= $db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0)
@@ -150,7 +150,7 @@ 
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
 		$result = $db->query($sql);
@@ -162,7 +162,7 @@ 
             {
                 $obj = $db->fetch_object($result);
                 $soc_static = new Societe($db);
-                if($soc_static->fetch($obj->rowid)) {
+                if ($soc_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($soc_static);
                 }
                 $i++;
@@ -171,7 +171,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'Thirdparties not found');
         }
 		return $obj_ret;
@@ -185,13 +185,13 @@ 
      */
     function post($request_data = NULL)
     {
-      if(! DolibarrApiAccess::$user->rights->societe->creer) {
+      if (!DolibarrApiAccess::$user->rights->societe->creer) {
         throw new RestException(401);
       }
       // Check mandatory fields
       $result = $this->_validate($request_data);
 
-      foreach($request_data as $field => $value) {
+      foreach ($request_data as $field => $value) {
           $this->company->$field = $value;
       }
       if ($this->company->create(DolibarrApiAccess::$user) < 0)
@@ -209,26 +209,26 @@ 
      */
     function put($id, $request_data = NULL)
     {
-        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+        if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
         $result = $this->company->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Thirdparty not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             if ($field == 'id') continue;
             $this->company->$field = $value;
         }
 
-        if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-            return $this->get ($id);
+        if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
+            return $this->get($id);
 
         return false;
     }
@@ -241,14 +241,14 @@ 
      */
     function delete($id)
     {
-      if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+      if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
         throw new RestException(401);
       }
       $result = $this->company->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
           throw new RestException(404, 'Thirdparty not found');
       }
-      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+      if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
       return $this->company->delete($id);
@@ -269,7 +269,7 @@ 
      */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
@@ -303,28 +303,28 @@ 
             throw new RestException(400, "category_id field missing");
         $category_id = $request_data["category_id"];
 
-      if(! DolibarrApiAccess::$user->rights->societe->creer) {
+      if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			  throw new RestException(401);
       }
 
       $result = $this->company->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
           throw new RestException(404, 'Thirdparty not found');
       }
       $category = new Categorie($this->db);
       $result = $category->fetch($category_id);
-      if( ! $result ) {
+      if (!$result) {
           throw new RestException(404, 'category not found');
       }
 
-      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+      if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
-      if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+      if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
 
-      $category->add_type($this->company,'customer');
+      $category->add_type($this->company, 'customer');
       return $this->company;
     }
 

htdocs/adherents/class/api_memberstypes.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
     /**
      * Clean sensible object datas
      *
-     * @param   object  $object    Object to clean
+     * @param   AdherentType  $object    Object to clean
      * @return    array    Array of cleaned object properties
      */
     function _cleanObjectDatas($object) {

Spacing +25 added lines, -25 removed lines

@@ -55,17 +55,17 @@ 
      */
     function get($id)
     {
-        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
             throw new RestException(401);
         }
 
         $membertype = new AdherentType($this->db);
         $result = $membertype->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'member type not found');
         }
 
-        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
@@ -91,40 +91,40 @@ 
 
         $obj_ret = array();
 
-        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
             throw new RestException(401);
         }
 
         $sql = "SELECT t.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
+        $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)    {
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
         if ($result)
         {
-            $i=0;
+            $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
@@ -140,7 +140,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
         }
-        if ( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No member type found');
         }
 
@@ -155,14 +155,14 @@ 
      */
     function post($request_data = null)
     {
-        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
             throw new RestException(401);
         }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
         $membertype = new AdherentType($this->db);
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $membertype->$field = $value;
         }
         if ($membertype->create(DolibarrApiAccess::$user) < 0) {
@@ -180,21 +180,21 @@ 
      */
     function put($id, $request_data = null)
     {
-        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
             throw new RestException(401);
         }
 
         $membertype = new AdherentType($this->db);
         $result = $membertype->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'member type not found');
         }
 
-        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             if ($field == 'id') continue;
             // Process the status separately because it must be updated using
             // the validate() and resiliate() methods of the class AdherentType.
@@ -217,21 +217,21 @@ 
      */
     function delete($id)
     {
-        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
             throw new RestException(401);
         }
         $membertype = new AdherentType($this->db);
         $result = $membertype->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'member type not found');
         }
 
-        if ( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        if (! $membertype->delete($membertype->id)) {
-            throw new RestException(401,'error when deleting member type');
+        if (!$membertype->delete($membertype->id)) {
+            throw new RestException(401, 'error when deleting member type');
         }
 
         return array(

Braces +10 added lines, -7 removed lines

@@ -136,8 +136,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
         }
         if ( ! count($obj_ret)) {
@@ -195,7 +194,9 @@ 
         }
 
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+            	continue;
+            }
             // Process the status separately because it must be updated using
             // the validate() and resiliate() methods of the class AdherentType.
             $membertype->$field = $value;
@@ -203,8 +204,9 @@ 
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
-            return $this->get($id);
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
+                    return $this->get($id);
+        }
 
         return false;
     }
@@ -254,8 +256,9 @@ 
     {
         $membertype = array();
         foreach (MembersTypes::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $membertype[$field] = $data[$field];
         }
         return $membertype;

Indentation +289 added lines, -289 removed lines

@@ -27,294 +27,294 @@
  */
 class MembersTypes extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'label'
-    );
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
-
-    /**
-     * Get properties of a member type object
-     *
-     * Return an array with member type informations
-     *
-     * @param     int     $id ID of member type
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    function get($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
-
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'member type not found');
-        }
-
-        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        return $this->_cleanObjectDatas($membertype);
-    }
-
-    /**
-     * List members types
-     *
-     * Get a list of members types
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
-     * @return array                Array of member type objects
-     *
-     * @throws RestException
-     */
-    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
-
-        $sql = "SELECT t.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
-
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)    {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $i=0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $db->fetch_object($result);
-                $membertype = new AdherentType($this->db);
-                if ($membertype->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($membertype);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
-        }
-        if ( ! count($obj_ret)) {
-            throw new RestException(404, 'No member type found');
-        }
-
-        return $obj_ret;
-    }
-
-    /**
-     * Create member type object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of member type
-     */
-    function post($request_data = null)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        $membertype = new AdherentType($this->db);
-        foreach($request_data as $field => $value) {
-            $membertype->$field = $value;
-        }
-        if ($membertype->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
-        }
-        return $membertype->id;
-    }
-
-    /**
-     * Update member type
-     *
-     * @param int   $id             ID of member type to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    function put($id, $request_data = null)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'member type not found');
-        }
-
-        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            // Process the status separately because it must be updated using
-            // the validate() and resiliate() methods of the class AdherentType.
-            $membertype->$field = $value;
-        }
-
-        // If there is no error, update() returns the number of affected rows
-        // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
-            return $this->get($id);
-
-        return false;
-    }
-
-    /**
-     * Delete member type
-     *
-     * @param int $id   member type ID
-     * @return array
-     */
-    function delete($id)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'member type not found');
-        }
-
-        if ( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        if (! $membertype->delete($membertype->id)) {
-            throw new RestException(401,'error when deleting member type');
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'member type deleted'
-            )
-        );
-    }
-
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $membertype = array();
-        foreach (MembersTypes::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $membertype[$field] = $data[$field];
-        }
-        return $membertype;
-    }
-
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    function _cleanObjectDatas($object) {
-
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->cotisation);
-
-        unset($object->array_options);
-        unset($object->linkedObjectsIds);
-        unset($object->context);
-        unset($object->canvas);
-        unset($object->fk_project);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->thirdparty);
-        unset($object->user);
-        unset($object->origin);
-        unset($object->origin_id);
-        unset($object->ref_ext);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->modelpdf);
-        unset($object->fk_account);
-        unset($object->note_public);
-        unset($object->note_private);
-        unset($object->fk_incoterms);
-        unset($object->libelle_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
-
-        return $object;
-    }
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'label'
+	);
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
+
+	/**
+	 * Get properties of a member type object
+	 *
+	 * Return an array with member type informations
+	 *
+	 * @param     int     $id ID of member type
+	 * @return    array|mixed data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	function get($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
+
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'member type not found');
+		}
+
+		if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($membertype);
+	}
+
+	/**
+	 * List members types
+	 *
+	 * Get a list of members types
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
+	 * @return array                Array of member type objects
+	 *
+	 * @throws RestException
+	 */
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
+		global $db, $conf;
+
+		$obj_ret = array();
+
+		if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT t.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
+		$sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
+
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (! DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)    {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
+
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$i=0;
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$membertype = new AdherentType($this->db);
+				if ($membertype->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($membertype);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
+		}
+		if ( ! count($obj_ret)) {
+			throw new RestException(404, 'No member type found');
+		}
+
+		return $obj_ret;
+	}
+
+	/**
+	 * Create member type object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of member type
+	 */
+	function post($request_data = null)
+	{
+		if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		$membertype = new AdherentType($this->db);
+		foreach($request_data as $field => $value) {
+			$membertype->$field = $value;
+		}
+		if ($membertype->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
+		}
+		return $membertype->id;
+	}
+
+	/**
+	 * Update member type
+	 *
+	 * @param int   $id             ID of member type to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	function put($id, $request_data = null)
+	{
+		if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'member type not found');
+		}
+
+		if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			// Process the status separately because it must be updated using
+			// the validate() and resiliate() methods of the class AdherentType.
+			$membertype->$field = $value;
+		}
+
+		// If there is no error, update() returns the number of affected rows
+		// so if the update is a no op, the return value is zero.
+		if ($membertype->update(DolibarrApiAccess::$user) >= 0)
+			return $this->get($id);
+
+		return false;
+	}
+
+	/**
+	 * Delete member type
+	 *
+	 * @param int $id   member type ID
+	 * @return array
+	 */
+	function delete($id)
+	{
+		if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'member type not found');
+		}
+
+		if ( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (! $membertype->delete($membertype->id)) {
+			throw new RestException(401,'error when deleting member type');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'member type deleted'
+			)
+		);
+	}
+
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	function _validate($data)
+	{
+		$membertype = array();
+		foreach (MembersTypes::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$membertype[$field] = $data[$field];
+		}
+		return $membertype;
+	}
+
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->cotisation);
+
+		unset($object->array_options);
+		unset($object->linkedObjectsIds);
+		unset($object->context);
+		unset($object->canvas);
+		unset($object->fk_project);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->ref_ext);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->modelpdf);
+		unset($object->fk_account);
+		unset($object->note_public);
+		unset($object->note_private);
+		unset($object->fk_incoterms);
+		unset($object->libelle_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+
+		return $object;
+	}
 
 }

htdocs/comm/action/class/api_agendaevents.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
      * @param string	$sortorder	Sort order
      * @param int		$limit		Limit for list
      * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+     * @param integer   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
      * @return  array               Array of Agenda Events objects
      */

Indentation +251 added lines, -251 removed lines

@@ -29,196 +29,196 @@ 
 class AgendaEvents extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-    );
-
-    /**
-     * @var Event $actioncomm {@type ActionComm}
-     */
-    public $actioncomm;
-
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+	);
+
+	/**
+	 * @var Event $actioncomm {@type ActionComm}
+	 */
+	public $actioncomm;
+
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->actioncomm = new ActionComm($this->db);
-    }
+		$this->actioncomm = new ActionComm($this->db);
+	}
 
-    /**
-     * Get properties of a Agenda Events object
-     *
-     * Return an array with Agenda Events informations
-     *
-     * @param       int         $id         ID of Agenda Events
-     * @return 	    array|mixed             Data without useless information
+	/**
+	 * Get properties of a Agenda Events object
 	 *
-     * @throws 	RestException
-     */
-    function get($id)
-    {
-        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-            throw new RestException(401, "Insuffisant rights to read an event");
-        }
+	 * Return an array with Agenda Events informations
+	 *
+	 * @param       int         $id         ID of Agenda Events
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	function get($id)
+	{
+		if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+			throw new RestException(401, "Insuffisant rights to read an event");
+		}
 
-        $result = $this->actioncomm->fetch($id);
-        if ( ! $result ) {
-            throw new RestException(404, 'Agenda Events not found');
-        }
+		$result = $this->actioncomm->fetch($id);
+		if ( ! $result ) {
+			throw new RestException(404, 'Agenda Events not found');
+		}
 
-        if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
-            throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+		if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
+			throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
 		if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $this->actioncomm->fetchObjectLinked();
+		$this->actioncomm->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->actioncomm);
-    }
+	}
 
-    /**
-     * List Agenda Events
-     *
-     * Get a list of Agenda Events
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
-     * @return  array               Array of Agenda Events objects
-     */
-    function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '') {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-        	throw new RestException(401, "Insuffisant rights to read events");
-        }
+	/**
+	 * List Agenda Events
+	 *
+	 * Get a list of Agenda Events
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
+	 * @return  array               Array of Agenda Events objects
+	 */
+	function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '') {
+		global $db, $conf;
 
-        // case of external user
-        $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
-
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT t.id as rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$obj_ret = array();
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+			throw new RestException(401, "Insuffisant rights to read events");
+		}
 
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
+		// case of external user
+		$socid = 0;
+		if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+
+		$sql = "SELECT t.id as rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+		if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
+		if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (! DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $result = $db->query($sql);
-
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $actioncomm_static = new ActionComm($db);
-                if ($actioncomm_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
-        }
-        if ( ! count($obj_ret)) {
-            throw new RestException(404, 'No Agenda Event found');
-        }
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)	{
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
+
+		$result = $db->query($sql);
+
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$actioncomm_static = new ActionComm($db);
+				if ($actioncomm_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
+		}
+		if ( ! count($obj_ret)) {
+			throw new RestException(404, 'No Agenda Event found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create Agenda Event object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int                     ID of Agenda Event
-     */
-    function post($request_data = NULL)
-    {
-      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+	/**
+	 * Create Agenda Event object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int                     ID of Agenda Event
+	 */
+	function post($request_data = NULL)
+	{
+	  if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+	  if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+			  throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
-            $this->actioncomm->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach($request_data as $field => $value) {
+			$this->actioncomm->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->expensereport->lines = $lines;
         }*/
-        if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
-        }
+		if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
+		}
 
-        return $this->actioncomm->id;
-    }
+		return $this->actioncomm->id;
+	}
 
 
-    /**
-     * Update Agenda Event general fields (won't touch lines of expensereport)
-     *
-     * @param int   $id             Id of Agenda Event to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Update Agenda Event general fields (won't touch lines of expensereport)
+	 *
+	 * @param int   $id             Id of Agenda Event to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	/*
     function put($id, $request_data = NULL) {
       if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
@@ -247,116 +247,116 @@ 
     }
     */
 
-    /**
-     * Delete Agenda Event
-     *
-     * @param   int     $id         Agenda Event ID
-     *
-     * @return  array
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
+	/**
+	 * Delete Agenda Event
+	 *
+	 * @param   int     $id         Agenda Event ID
+	 *
+	 * @return  array
+	 */
+	function delete($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
 			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
 		}
 
 		$result = $this->actioncomm->fetch($id);
 
-        if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
-		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
+			  throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		}
 
 		if( ! $result ) {
-            throw new RestException(404, 'Agenda Event not found');
-        }
+			throw new RestException(404, 'Agenda Event not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
-        }
+		if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Agenda Event deleted'
-            )
-        );
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Agenda Event deleted'
+			)
+		);
 
-    }
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    function _validate($data)
-    {
-        $event = array();
-        foreach (AgendaEvents::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $event[$field] = $data[$field];
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	function _validate($data)
+	{
+		$event = array();
+		foreach (AgendaEvents::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$event[$field] = $data[$field];
 
-        }
-        return $event;
-    }
+		}
+		return $event;
+	}
 
-    /**
-     * Clean sensible object datas
-     *
-     * @param	object	$object		Object to clean
-     * @return	array				Array of cleaned object properties
-     */
-    function _cleanObjectDatas($object) {
-
-    	$object = parent::_cleanObjectDatas($object);
-
-    	unset($object->usermod);
-    	unset($object->libelle);
-    	unset($object->array_options);
-    	unset($object->context);
-    	unset($object->canvas);
-    	unset($object->contact);
-    	unset($object->contact_id);
-    	unset($object->thirdparty);
-    	unset($object->user);
-    	unset($object->origin);
-    	unset($object->origin_id);
-    	unset($object->ref_ext);
-    	unset($object->statut);
-    	unset($object->country);
-    	unset($object->country_id);
-    	unset($object->country_code);
-    	unset($object->barcode_type);
-    	unset($object->barcode_type_code);
-    	unset($object->barcode_type_label);
-    	unset($object->barcode_type_coder);
-    	unset($object->mode_reglement_id);
-    	unset($object->cond_reglement_id);
-    	unset($object->cond_reglement);
-    	unset($object->fk_delivery_address);
-    	unset($object->shipping_method_id);
-    	unset($object->fk_account);
-    	unset($object->total_ht);
-    	unset($object->total_tva);
-    	unset($object->total_localtax1);
-    	unset($object->total_localtax2);
-    	unset($object->total_ttc);
-    	unset($object->fk_incoterms);
-    	unset($object->libelle_incoterms);
-    	unset($object->location_incoterms);
-    	unset($object->name);
-    	unset($object->lastname);
-    	unset($object->firstname);
-    	unset($object->civility_id);
-    	unset($object->contact);
-    	unset($object->societe);
-
-    	return $object;
-    }
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param	object	$object		Object to clean
+	 * @return	array				Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->usermod);
+		unset($object->libelle);
+		unset($object->array_options);
+		unset($object->context);
+		unset($object->canvas);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->ref_ext);
+		unset($object->statut);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->fk_incoterms);
+		unset($object->libelle_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->contact);
+		unset($object->societe);
+
+		return $object;
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -63,20 +63,20 @@ 
      */
     function get($id)
     {
-        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read an event");
         }
 
         $result = $this->actioncomm->fetch($id);
-        if ( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Agenda Events not found');
         }
 
-        if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
+        if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
 
-		if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
+		if (!DolibarrApi::_checkAccessToResource('agenda', $this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -102,26 +102,26 @@ 
 
         $obj_ret = array();
 
-        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
         	throw new RestException(401, "Insuffisant rights to read events");
         }
 
         // case of external user
         $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+        if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.id as rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+        if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
+        if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -130,23 +130,23 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
@@ -168,7 +168,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
-        if ( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No Agenda Event found');
         }
 		return $obj_ret;
@@ -182,17 +182,17 @@ 
      */
     function post($request_data = NULL)
     {
-      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+      if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+      if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->actioncomm->$field = $value;
         }
         /*if (isset($request_data["lines"])) {
@@ -256,25 +256,25 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
 			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
 		}
 
 		$result = $this->actioncomm->fetch($id);
 
-        if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
+        if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
 		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		}
 
-		if( ! $result ) {
+		if (!$result) {
             throw new RestException(404, 'Agenda Event not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
+		if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
+        if (!$this->actioncomm->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
         }
 

Braces +27 added lines, -11 removed lines

@@ -108,20 +108,36 @@ 
 
         // case of external user
         $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+        if (! empty(DolibarrApiAccess::$user->socid)) {
+        	$socid = DolibarrApiAccess::$user->socid;
+        }
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+        	$search_sale = DolibarrApiAccess::$user->id;
+        }
 
         $sql = "SELECT t.id as rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+        	$sql .= ", sc.fk_soc, sc.fk_user";
+        }
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+        	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
+        // We need this table joined to the select in order to filter by sale
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+        	$sql.= " AND t.fk_soc = sc.fk_soc";
+        }
+        if ($user_ids) {
+        	$sql.=" AND t.fk_user_action IN (".$user_ids.")";
+        }
+        if ($socid > 0) {
+        	$sql.= " AND t.fk_soc = ".$socid;
+        }
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -164,8 +180,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
         if ( ! count($obj_ret)) {
@@ -298,8 +313,9 @@ 
     {
         $event = array();
         foreach (AgendaEvents::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $event[$field] = $data[$field];
 
         }

htdocs/core/lib/expensereport.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
  * Returns an array with the tabs for the "Expense report payment" section
  * It loads tabs from modules looking for the entity payment
  * 
- * @param	Paiement	$object		Current payment object
+ * @param	PaymentExpenseReport	$object		Current payment object
  * @return	array					Tabs for the payment section
  */
 function payment_expensereport_prepare_head(PaymentExpenseReport $object) {

Indentation +20 added lines, -20 removed lines

@@ -41,15 +41,15 @@ 
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
@@ -58,14 +58,14 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
-	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
-	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-	    $head[$h][2] = 'note';
-	    $h++;
+		$nbNote = 0;
+		if(!empty($object->note_private)) $nbNote++;
+		if(!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		$head[$h][2] = 'note';
+		$h++;
 	}
 	
 	$head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
@@ -97,11 +97,11 @@ 
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
@@ -140,10 +140,10 @@ 
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    /*
+	/*
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributesdet';

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -43,37 +43,37 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
+	    if (!empty($object->note_private)) $nbNote++;
+	    if (!empty($object->note_public)) $nbNote++;
 	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	    $head[$h][2] = 'note';
 	    $h++;
 	}
 	
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'remove');
 
 	return $head;
 }
@@ -101,14 +101,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport', 'remove');
 
 	return $head;
 }
@@ -136,7 +136,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -150,7 +150,7 @@ 
     $h++;
 	*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
 
 	return $head;
 }

Braces +12 added lines, -4 removed lines

@@ -52,18 +52,26 @@
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+		$head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
+	    if(!empty($object->note_private)) {
+	    	$nbNote++;
+	    }
+	    if(!empty($object->note_public)) {
+	    	$nbNote++;
+	    }
 	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    if ($nbNote > 0) {
+	    	$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    }
 	    $head[$h][2] = 'note';
 	    $h++;
 	}

htdocs/loan/class/loanschedule.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 	/**
 	 *  Update database
 	 *
-	 *  @param	User	$user        	User that modify
+	 *  @param	integer	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int         			<0 if KO, >0 if OK
 	 */

Indentation +20 added lines, -20 removed lines

@@ -36,8 +36,8 @@ 
 	var $datec='';
 	var $tms='';
 	var $datep='';
-    var $amounts=array();   // Array of amounts
-    var $amount_capital;    // Total amount of payment
+	var $amounts=array();   // Array of amounts
+	var $amount_capital;    // Total amount of payment
 	var $amount_insurance;
 	var $amount_interest;
 	var $fk_typepayment;
@@ -65,8 +65,8 @@ 
 
 	/**
 	 *  Create payment of loan into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -76,9 +76,9 @@ 
 
 		$error=0;
 
-        $now=dol_now();
+		$now=dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (! $this->datepaid)
 		{
 			$this->error='ErrorBadValueForParameter';
@@ -95,14 +95,14 @@ 
 		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
 
-        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
-        $totalamount = price2num($totalamount);
+		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) {
-        	$this->errors[]='step1';
-        	return -1; // Negative amounts are accepted for reject prelevement but not null
-        }
+		// Check parameters
+		if ($totalamount == 0) {
+			$this->errors[]='step1';
+			return -1; // Negative amounts are accepted for reject prelevement but not null
+		}
 
 
 		$this->db->begin();
@@ -128,7 +128,7 @@ 
 			}
 			else
 			{
-                $this->error=$this->db->lasterror();
+				$this->error=$this->db->lasterror();
 				$error++;
 			}
 
@@ -136,9 +136,9 @@ 
 
 		if ($totalamount != 0 && ! $error)
 		{
-		    $this->amount_capital=$totalamount;
-            $this->total=$totalamount;    // deprecated
-		    $this->db->commit();
+			$this->amount_capital=$totalamount;
+			$this->total=$totalamount;    // deprecated
+			$this->db->commit();
 			return $this->id;
 		}
 		else
@@ -169,8 +169,8 @@ 
 		$sql.= " t.amount_interest,";
 		$sql.= " t.fk_typepayment,";
 		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
+		$sql.= " t.note_private,";
+		$sql.= " t.note_public,";
 		$sql.= " t.fk_bank,";
 		$sql.= " t.fk_user_creat,";
 		$sql.= " t.fk_user_modif,";
@@ -322,7 +322,7 @@ 
 
 		$this->db->begin();
 
-	    if (! $error)
+		if (! $error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
 			$sql.= " WHERE rowid=".$this->id;

Braces +65 added lines, -33 removed lines

@@ -86,14 +86,30 @@ 
 		}
 
 		// Clean parameters
-		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
-		if (isset($this->amount_capital))	$this->amount_capital = trim($this->amount_capital?$this->amount_capital:0);
-		if (isset($this->amount_insurance))	$this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0);
-		if (isset($this->amount_interest))	$this->amount_interest = trim($this->amount_interest?$this->amount_interest:0);
-		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
-		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = trim($this->fk_loan);
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = trim($this->amount_capital?$this->amount_capital:0);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = trim($this->amount_interest?$this->amount_interest:0);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = trim($this->fk_user_modif);
+		}
 
         $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
         $totalamount = price2num($totalamount);
@@ -125,8 +141,7 @@ 
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
+			} else
 			{
                 $this->error=$this->db->lasterror();
 				$error++;
@@ -140,8 +155,7 @@ 
             $this->total=$totalamount;    // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->errors[]=$this->db->lasterror();
 			$this->db->rollback();
@@ -215,8 +229,7 @@ 
 		$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -237,17 +250,39 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
-		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) {
+			$this->fk_loan=trim($this->fk_loan);
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital=trim($this->amount_capital);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance=trim($this->amount_insurance);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest=trim($this->amount_interest);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment=trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment=trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public=trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank=trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat=trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif=trim($this->fk_user_modif);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -299,8 +334,7 @@ 
 		{
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -358,8 +392,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -438,8 +471,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -477,7 +509,7 @@ 
 						$res=$this->db->query($sql);
 						if($res){
 							$this->db->commit();
-						}else {
+						} else {
 							$this->db->rollback();
 						}
 					}
@@ -506,7 +538,7 @@ 
 		if($resql){
 			$obj = $this->db->fetch_object($resql);
 			return $this->db->jdate($obj->datep);
-		}else{
+		} else{
 			return -1;
 		}
 	}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -415,7 +415,7 @@
 		{
 			while($obj = $this->db->fetch_object($resql))
 			{
-				$line = New LoanSchedule($this->db);
+				$line = new LoanSchedule($this->db);
 				$line->id = $obj->rowid;
 				$line->ref = $obj->rowid;
 

Spacing +148 added lines, -148 removed lines

@@ -29,15 +29,15 @@ 
  */
 class LoanSchedule extends CommonObject
 {
-	public $element='loan_schedule';			//!< Id that identify managed objects
-	public $table_element='loan_schedule';	//!< Name of table without prefix where object is stored
+	public $element = 'loan_schedule'; //!< Id that identify managed objects
+	public $table_element = 'loan_schedule'; //!< Name of table without prefix where object is stored
 
 	var $fk_loan;
-	var $datec='';
-	var $tms='';
-	var $datep='';
-    var $amounts=array();   // Array of amounts
-    var $amount_capital;    // Total amount of payment
+	var $datec = '';
+	var $tms = '';
+	var $datep = '';
+    var $amounts = array(); // Array of amounts
+    var $amount_capital; // Total amount of payment
 	var $amount_insurance;
 	var $amount_interest;
 	var $fk_typepayment;
@@ -45,7 +45,7 @@ 
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
-	var $lines=array();
+	var $lines = array();
 
 	/**
 	 * @deprecated
@@ -74,22 +74,22 @@ 
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Validate parameters
-		if (! $this->datepaid)
+		if (!$this->datepaid)
 		{
-			$this->error='ErrorBadValueForParameter';
+			$this->error = 'ErrorBadValueForParameter';
 			return -1;
 		}
 
 		// Clean parameters
 		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
-		if (isset($this->amount_capital))	$this->amount_capital = trim($this->amount_capital?$this->amount_capital:0);
-		if (isset($this->amount_insurance))	$this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0);
-		if (isset($this->amount_interest))	$this->amount_interest = trim($this->amount_interest?$this->amount_interest:0);
+		if (isset($this->amount_capital))	$this->amount_capital = trim($this->amount_capital ? $this->amount_capital : 0);
+		if (isset($this->amount_insurance))	$this->amount_insurance = trim($this->amount_insurance ? $this->amount_insurance : 0);
+		if (isset($this->amount_interest))	$this->amount_interest = trim($this->amount_interest ? $this->amount_interest : 0);
 		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
 		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
 		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
@@ -100,7 +100,7 @@ 
 
         // Check parameters
         if ($totalamount == 0) {
-        	$this->errors[]='step1';
+        	$this->errors[] = 'step1';
         	return -1; // Negative amounts are accepted for reject prelevement but not null
         }
 
@@ -110,40 +110,40 @@ 
 		if ($totalamount != 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,";
-			$sql.= " fk_typepayment, fk_user_creat, fk_bank)";
-			$sql.= " VALUES (".$this->fk_loan.", '".$this->db->idate($now)."',";
-			$sql.= " '".$this->db->idate($this->datepaid)."',";
-			$sql.= " ".$this->amount_capital.",";
-			$sql.= " ".$this->amount_insurance.",";
-			$sql.= " ".$this->amount_interest.",";
-			$sql.= " ".$this->fk_typepayment.", ";
-			$sql.= " ".$user->id.",";
-			$sql.= " ".$this->fk_bank . ")";
+			$sql .= " fk_typepayment, fk_user_creat, fk_bank)";
+			$sql .= " VALUES (".$this->fk_loan.", '".$this->db->idate($now)."',";
+			$sql .= " '".$this->db->idate($this->datepaid)."',";
+			$sql .= " ".$this->amount_capital.",";
+			$sql .= " ".$this->amount_insurance.",";
+			$sql .= " ".$this->amount_interest.",";
+			$sql .= " ".$this->fk_typepayment.", ";
+			$sql .= " ".$user->id.",";
+			$sql .= " ".$this->fk_bank.")";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
 			}
 			else
 			{
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
 				$error++;
 			}
 
 		}
 
-		if ($totalamount != 0 && ! $error)
+		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount_capital=$totalamount;
-            $this->total=$totalamount;    // deprecated
+		    $this->amount_capital = $totalamount;
+            $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
 		}
 		else
 		{
-			$this->errors[]=$this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -159,30 +159,30 @@ 
 	{
 		global $langs;
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.fk_loan,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.datep,";
-		$sql.= " t.amount_capital,";
-		$sql.= " t.amount_insurance,";
-		$sql.= " t.amount_interest,";
-		$sql.= " t.fk_typepayment,";
-		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-		$sql.= " t.fk_bank,";
-		$sql.= " t.fk_user_creat,";
-		$sql.= " t.fk_user_modif,";
-		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
-		$sql.= ' b.fk_account';
-		$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX.$this->table_element." as t)";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
-		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
-		$sql.= " AND pt.entity = " . getEntity('c_paiement');
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_loan,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount_capital,";
+		$sql .= " t.amount_insurance,";
+		$sql .= " t.amount_interest,";
+		$sql .= " t.fk_typepayment,";
+		$sql .= " t.num_payment,";
+        $sql .= " t.note_private,";
+        $sql .= " t.note_public,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif,";
+		$sql .= " pt.code as type_code, pt.libelle as type_libelle,";
+		$sql .= ' b.fk_account';
+		$sql .= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX.$this->table_element." as t)";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql .= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
+		$sql .= " AND pt.entity = ".getEntity('c_paiement');
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 	{
 		if ($this->db->num_rows($resql))
@@ -219,7 +219,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -232,23 +232,23 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	function update($user=0, $notrigger=0)
+	function update($user = 0, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
-		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan);
+		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
+		if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
+		if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -256,32 +256,32 @@ 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 
-		$sql.= " fk_loan=".(isset($this->fk_loan)?$this->fk_loan:"null").",";
-		$sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
-		$sql.= " amount_capital=".(isset($this->amount_capital)?$this->amount_capital:"null").",";
-		$sql.= " amount_insurance=".(isset($this->amount_insurance)?$this->amount_insurance:"null").",";
-		$sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").",";
-		$sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").",";
-		$sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").",";
-		$sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").",";
-		$sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null")."";
-
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " fk_loan=".(isset($this->fk_loan) ? $this->fk_loan : "null").",";
+		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql .= " amount_capital=".(isset($this->amount_capital) ? $this->amount_capital : "null").",";
+		$sql .= " amount_insurance=".(isset($this->amount_insurance) ? $this->amount_insurance : "null").",";
+		$sql .= " amount_interest=".(isset($this->amount_interest) ? $this->amount_interest : "null").",";
+		$sql .= " fk_typepayment=".(isset($this->fk_typepayment) ? $this->fk_typepayment : "null").",";
+		$sql .= " num_payment=".(isset($this->num_payment) ? "'".$this->db->escape($this->num_payment)."'" : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
+		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
+		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "null")."";
+
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action call a trigger.
@@ -299,7 +299,7 @@ 
 		if ($error)
 		{
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -316,26 +316,26 @@ 
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
 	 *  @return int						<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-	    if (! $error)
+	    if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " WHERE rowid=".$this->id;
+			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action call a trigger.
@@ -352,13 +352,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -367,13 +367,13 @@ 
 		}
 	}
 
-	function calc_mens($capital,$rate,$nbterm)
+	function calc_mens($capital, $rate, $nbterm)
 	{
-		$result='';
+		$result = '';
 
-		if (!empty($capital)&&!empty($rate)&&!empty($nbterm))
+		if (!empty($capital) && !empty($rate) && !empty($nbterm))
 		{
-			$result=($capital*($rate/12))/(1-pow((1+($rate/12)),($nbterm*-1)));
+			$result = ($capital * ($rate / 12)) / (1 - pow((1 + ($rate / 12)), ($nbterm * -1)));
 		}
 
 		return $result;
@@ -391,30 +391,30 @@ 
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.fk_loan,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.datep,";
-		$sql.= " t.amount_capital,";
-		$sql.= " t.amount_insurance,";
-		$sql.= " t.amount_interest,";
-		$sql.= " t.fk_typepayment,";
-		$sql.= " t.num_payment,";
-		$sql.= " t.note_private,";
-		$sql.= " t.note_public,";
-		$sql.= " t.fk_bank,";
-		$sql.= " t.fk_user_creat,";
-		$sql.= " t.fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		$sql.= " WHERE t.fk_loan = ".$loanid;
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_loan,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount_capital,";
+		$sql .= " t.amount_insurance,";
+		$sql .= " t.amount_interest,";
+		$sql .= " t.fk_typepayment,";
+		$sql .= " t.num_payment,";
+		$sql .= " t.note_private,";
+		$sql .= " t.note_public,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " WHERE t.fk_loan = ".$loanid;
 
 		dol_syslog(get_class($this)."::fetchall", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
 		if ($resql)
 		{
-			while($obj = $this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$line = New LoanSchedule($this->db);
 				$line->id = $obj->rowid;
@@ -442,7 +442,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -461,24 +461,24 @@ 
 		$toinsert = array();
 
 		$sql = "SELECT l.rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."loan as l ";
-		$sql.= " WHERE l.paid = 0";
-		$resql=$this->db->query($sql);
+		$sql .= " FROM ".MAIN_DB_PREFIX."loan as l ";
+		$sql .= " WHERE l.paid = 0";
+		$resql = $this->db->query($sql);
 
-		if($resql){
-			while($obj = $this->db->fetch_object($resql)){
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$lastrecorded = $this->lastpaiment($obj->rowid);
 				$toinsert = $this->paimenttorecord($obj->rowid, $lastrecorded);
-				if(count($toinsert)>0){
-					foreach ($toinsert as $echid){
+				if (count($toinsert) > 0) {
+					foreach ($toinsert as $echid) {
 						$this->db->begin();
-						$sql = "INSERT INTO " .MAIN_DB_PREFIX . "payment_loan ";
-						$sql.= "(fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif) ";
-						$sql.= "SELECT fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif FROM " . MAIN_DB_PREFIX . "loan_schedule WHERE rowid =" .$echid;
-						$res=$this->db->query($sql);
-						if($res){
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan ";
+						$sql .= "(fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif) ";
+						$sql .= "SELECT fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif FROM ".MAIN_DB_PREFIX."loan_schedule WHERE rowid =".$echid;
+						$res = $this->db->query($sql);
+						if ($res) {
 							$this->db->commit();
-						}else {
+						} else {
 							$this->db->rollback();
 						}
 					}
@@ -497,17 +497,17 @@ 
 	function lastpaiment($loanid)
 	{
 		$sql = "SELECT p.datep";
-		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
-		$sql.= " WHERE p.fk_loan = " . $loanid;
-		$sql.= " ORDER BY p.datep DESC ";
-		$sql.= " LIMIT 1 ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
+		$sql .= " WHERE p.fk_loan = ".$loanid;
+		$sql .= " ORDER BY p.datep DESC ";
+		$sql .= " LIMIT 1 ";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
-		if($resql){
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			return $this->db->jdate($obj->datep);
-		}else{
+		} else {
 			return -1;
 		}
 	}
@@ -522,15 +522,15 @@ 
 	function paimenttorecord($loanid, $datemax)
 	{
 		$sql = "SELECT p.rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
-		$sql.= " WHERE p.fk_loan = " . $loanid;
-		if (!empty($datemax)) { $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
-		$sql.= " AND p.datep <= '" . $this->db->idate(dol_now()). "'";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
+		$sql .= " WHERE p.fk_loan = ".$loanid;
+		if (!empty($datemax)) { $sql .= " AND p.datep > '".$this->db->idate($datemax)."'"; }
+		$sql .= " AND p.datep <= '".$this->db->idate(dol_now())."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
-		if($resql){
-			while($obj = $this->db->fetch_object($resql))
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$result[] = $obj->rowid;
 			}

htdocs/supplier_proposal/class/supplier_proposal.class.php

Doc Comments +8 added lines, -8 removed lines

@@ -339,12 +339,12 @@ 
      * 		@param    	double		$pu_ht				Prix unitaire
      * 		@param    	double		$qty             	Quantite
      * 		@param    	double		$txtva           	Taux de tva
-     * 		@param		double		$txlocaltax1		Local tax 1 rate
-     *  	@param		double		$txlocaltax2		Local tax 2 rate
+     * 		@param		integer		$txlocaltax1		Local tax 1 rate
+     *  	@param		integer		$txlocaltax2		Local tax 2 rate
      *		@param    	int			$fk_product      	Id du produit/service predefini
-     * 		@param    	double		$remise_percent  	Pourcentage de remise de la ligne
+     * 		@param    	integer		$remise_percent  	Pourcentage de remise de la ligne
      * 		@param    	string		$price_base_type	HT or TTC
-     * 		@param    	double		$pu_ttc             Prix unitaire TTC
+     * 		@param    	integer		$pu_ttc             Prix unitaire TTC
      * 		@param    	int			$info_bits			Bits de type de lignes
      *      @param      int			$type               Type of line (product, service)
      *      @param      int			$rang               Position of line
@@ -353,7 +353,7 @@ 
      *      @param		int			$fk_fournprice		Id supplier price
      *      @param		int			$pa_ht				Buying price without tax
      *      @param		string		$label				???
-     *      @param		array		$array_option		extrafields array
+     *      @param		integer		$array_option		extrafields array
 	 * 		@param		string		$ref_fourn			Supplier price reference
 	 * 		@param		int			$fk_unit			Id of the unit to use.
 	 * 		@param		string		$origin				'order', 'supplier_proposal', ...
@@ -537,8 +537,8 @@ 
      *  @param      double		$qty            	Quantity
      *  @param      double		$remise_percent  	Remise effectuee sur le produit
      *  @param      double		$txtva	          	Taux de TVA
-     * 	@param	  	double		$txlocaltax1		Local tax 1 rate
-     *  @param	  	double		$txlocaltax2		Local tax 2 rate
+     * 	@param	  	integer		$txlocaltax1		Local tax 1 rate
+     *  @param	  	integer		$txlocaltax2		Local tax 2 rate
      *  @param      string		$desc            	Description
      *	@param	  	double		$price_base_type	HT ou TTC
      *	@param      int			$info_bits        	Miscellaneous informations
@@ -549,7 +549,7 @@ 
      *  @param		int			$pa_ht				Price (without tax) of product when it was bought
      *  @param		string		$label				???
      *  @param		int			$type				0/1=Product/service
-	 *  @param		array		$array_option		extrafields array
+	 *  @param		integer		$array_option		extrafields array
 	 * 	@param		string		$ref_fourn			Supplier price reference
 	 *	@param		int			$fk_unit			Id of the unit to use.
      *  @return     int     		        		0 if OK, <0 if KO

Indentation +2537 added lines, -2537 removed lines

@@ -44,29 +44,29 @@ 
  */
 class SupplierProposal extends CommonObject
 {
-    public $element='supplier_proposal';
-    public $table_element='supplier_proposal';
-    public $table_element_line='supplier_proposaldet';
-    public $fk_element='fk_supplier_proposal';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='propal';
+	public $element='supplier_proposal';
+	public $table_element='supplier_proposal';
+	public $table_element_line='supplier_proposaldet';
+	public $fk_element='fk_supplier_proposal';
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto='propal';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    var $socid;		// Id client
+	var $socid;		// Id client
 
 	/**
 	 * @deprecated
 	 * @see user_author_id
 	 */
-    var $author;
+	var $author;
 	var $ref_fourn;  //Reference saisie lors de l'ajout d'une ligne à la demande
-    var $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
-    var $date;						// Date of proposal
-    var $date_livraison;
+	var $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
+	var $date;						// Date of proposal
+	var $date_livraison;
 
 	/**
 	 * @deprecated
@@ -93,45 +93,45 @@ 
 	public $date_validation;
 
 
-    var $user_author_id;
-    var $user_valid_id;
-    var $user_close_id;
+	var $user_author_id;
+	var $user_valid_id;
+	var $user_close_id;
 
 	/**
 	 * @deprecated
 	 * @see price_ht
 	 */
-    var $price;
+	var $price;
 	/**
 	 * @deprecated
 	 * @see total_tva
 	 */
-    var $tva;
+	var $tva;
 	/**
 	 * @deprecated
 	 * @see total_ttc
 	 */
-    var $total;
+	var $total;
 
-    var $cond_reglement_code;
-    var $mode_reglement_code;
-    var $remise;
-    var $remise_percent;
-    var $remise_absolue;
+	var $cond_reglement_code;
+	var $mode_reglement_code;
+	var $remise;
+	var $remise_percent;
+	var $remise_absolue;
 
-    var $products=array();
-    var $extraparams=array();
+	var $products=array();
+	var $extraparams=array();
 
-    var $lines = array();
-    var $line;
+	var $lines = array();
+	var $line;
 
-    var $labelstatut=array();
-    var $labelstatut_short=array();
+	var $labelstatut=array();
+	var $labelstatut_short=array();
 
-    var $nbtodo;
-    var $nbtodolate;
+	var $nbtodo;
+	var $nbtodolate;
 
-    var $specimen;
+	var $specimen;
 
 	// Multicurrency
 	var $fk_multicurrency;
@@ -164,319 +164,319 @@ 
 
 
 
-    /**
-     *	Constructor
-     *
-     *	@param      DoliDB	$db         Database handler
-     *	@param      int		$socid		Id third party
-     *	@param      int		$supplier_proposalid   Id supplier_proposal
-     */
-    function __construct($db, $socid="", $supplier_proposalid=0)
-    {
-        global $conf,$langs;
-
-        $this->db = $db;
-        $this->socid = $socid;
-        $this->id = $supplier_proposalid;
-        $this->products = array();
-        $this->remise = 0;
-        $this->remise_percent = 0;
-        $this->remise_absolue = 0;
-
-        $langs->load("supplier_proposal");
-        $this->labelstatut[0]=$langs->trans("SupplierProposalStatusDraft");
-        $this->labelstatut[1]=$langs->trans("SupplierProposalStatusValidated");
-        $this->labelstatut[2]=$langs->trans("SupplierProposalStatusSigned");
-        $this->labelstatut[3]=$langs->trans("SupplierProposalStatusNotSigned");
-        $this->labelstatut[4]=$langs->trans("SupplierProposalStatusClosed");
-        $this->labelstatut_short[0]=$langs->trans("SupplierProposalStatusDraftShort");
-        $this->labelstatut_short[1]=$langs->trans("Opened");
-        $this->labelstatut_short[2]=$langs->trans("SupplierProposalStatusSignedShort");
-        $this->labelstatut_short[3]=$langs->trans("SupplierProposalStatusNotSignedShort");
-        $this->labelstatut_short[4]=$langs->trans("SupplierProposalStatusClosedShort");
-    }
-
-
-    /**
-     * 	Add line into array products
-     *	$this->client doit etre charge
-     *
-     * 	@param  int		$idproduct       	Product Id to add
-     * 	@param  int		$qty             	Quantity
-     * 	@param  int		$remise_percent  	Discount effected on Product
-     *  @return	int							<0 if KO, >0 if OK
-     *
-     *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
-     *			insere dans tableau $this->products
-     */
-    function add_product($idproduct, $qty, $remise_percent=0)
-    {
-        global $conf, $mysoc;
-
-        if (! $qty) $qty = 1;
-
-        dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
-        if ($idproduct > 0)
-        {
-            $prod=new Product($this->db);
-            $prod->fetch($idproduct);
-
-            $productdesc = $prod->description;
-
-            $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
-            $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
-            if (empty($tva_tx)) $tva_npr=0;
-            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
-            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
-
-            // multiprix
-            if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
-            {
-                $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else
-            {
-                $price = $prod->price;
-            }
-
-            $line = new SupplierProposalLine($this->db);
-
-            $line->fk_product=$idproduct;
-            $line->desc=$productdesc;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->tva_tx=$tva_tx;
-
-            $this->lines[]=$line;
-        }
-    }
-
-    /**
-     *	Adding line of fixed discount in the proposal in DB
-     *
-     *	@param     int		$idremise			Id of fixed discount
-     *  @return    int          				>0 if OK, <0 if KO
-     */
-    function insert_discount($idremise)
-    {
-        global $langs;
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-        $this->db->begin();
-
-        $remise=new DiscountAbsolute($this->db);
-        $result=$remise->fetch($idremise);
-
-        if ($result > 0)
-        {
-            if ($remise->fk_facture)	// Protection against multiple submission
-            {
-                $this->error=$langs->trans("ErrorDiscountAlreadyUsed");
-                $this->db->rollback();
-                return -5;
-            }
-
-            $supplier_proposalligne=new SupplierProposalLine($this->db);
-            $supplier_proposalligne->fk_supplier_proposal=$this->id;
-            $supplier_proposalligne->fk_remise_except=$remise->id;
-            $supplier_proposalligne->desc=$remise->description;   	// Description ligne
-            $supplier_proposalligne->tva_tx=$remise->tva_tx;
-            $supplier_proposalligne->subprice=-$remise->amount_ht;
-            $supplier_proposalligne->fk_product=0;					// Id produit predefini
-            $supplier_proposalligne->qty=1;
-            $supplier_proposalligne->remise=0;
-            $supplier_proposalligne->remise_percent=0;
-            $supplier_proposalligne->rang=-1;
-            $supplier_proposalligne->info_bits=2;
-
-            // TODO deprecated
-            $supplier_proposalligne->price=-$remise->amount_ht;
-
-            $supplier_proposalligne->total_ht  = -$remise->amount_ht;
-            $supplier_proposalligne->total_tva = -$remise->amount_tva;
-            $supplier_proposalligne->total_ttc = -$remise->amount_ttc;
-
-            $result=$supplier_proposalligne->insert();
-            if ($result > 0)
-            {
-                $result=$this->update_price(1);
-                if ($result > 0)
-                {
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error=$supplier_proposalligne->error;
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     *    	Add a proposal line into database (linked to product/service or not)
-     * 		Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
-     *		de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
-     *		par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit)
-     *		et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
-     *
-     * 		@param    	string		$desc				Description de la ligne
-     * 		@param    	double		$pu_ht				Prix unitaire
-     * 		@param    	double		$qty             	Quantite
-     * 		@param    	double		$txtva           	Taux de tva
-     * 		@param		double		$txlocaltax1		Local tax 1 rate
-     *  	@param		double		$txlocaltax2		Local tax 2 rate
-     *		@param    	int			$fk_product      	Id du produit/service predefini
-     * 		@param    	double		$remise_percent  	Pourcentage de remise de la ligne
-     * 		@param    	string		$price_base_type	HT or TTC
-     * 		@param    	double		$pu_ttc             Prix unitaire TTC
-     * 		@param    	int			$info_bits			Bits de type de lignes
-     *      @param      int			$type               Type of line (product, service)
-     *      @param      int			$rang               Position of line
-     *      @param		int			$special_code		Special code (also used by externals modules!)
-     *      @param		int			$fk_parent_line		Id of parent line
-     *      @param		int			$fk_fournprice		Id supplier price
-     *      @param		int			$pa_ht				Buying price without tax
-     *      @param		string		$label				???
-     *      @param		array		$array_option		extrafields array
+	/**
+	 *	Constructor
+	 *
+	 *	@param      DoliDB	$db         Database handler
+	 *	@param      int		$socid		Id third party
+	 *	@param      int		$supplier_proposalid   Id supplier_proposal
+	 */
+	function __construct($db, $socid="", $supplier_proposalid=0)
+	{
+		global $conf,$langs;
+
+		$this->db = $db;
+		$this->socid = $socid;
+		$this->id = $supplier_proposalid;
+		$this->products = array();
+		$this->remise = 0;
+		$this->remise_percent = 0;
+		$this->remise_absolue = 0;
+
+		$langs->load("supplier_proposal");
+		$this->labelstatut[0]=$langs->trans("SupplierProposalStatusDraft");
+		$this->labelstatut[1]=$langs->trans("SupplierProposalStatusValidated");
+		$this->labelstatut[2]=$langs->trans("SupplierProposalStatusSigned");
+		$this->labelstatut[3]=$langs->trans("SupplierProposalStatusNotSigned");
+		$this->labelstatut[4]=$langs->trans("SupplierProposalStatusClosed");
+		$this->labelstatut_short[0]=$langs->trans("SupplierProposalStatusDraftShort");
+		$this->labelstatut_short[1]=$langs->trans("Opened");
+		$this->labelstatut_short[2]=$langs->trans("SupplierProposalStatusSignedShort");
+		$this->labelstatut_short[3]=$langs->trans("SupplierProposalStatusNotSignedShort");
+		$this->labelstatut_short[4]=$langs->trans("SupplierProposalStatusClosedShort");
+	}
+
+
+	/**
+	 * 	Add line into array products
+	 *	$this->client doit etre charge
+	 *
+	 * 	@param  int		$idproduct       	Product Id to add
+	 * 	@param  int		$qty             	Quantity
+	 * 	@param  int		$remise_percent  	Discount effected on Product
+	 *  @return	int							<0 if KO, >0 if OK
+	 *
+	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
+	 *			insere dans tableau $this->products
+	 */
+	function add_product($idproduct, $qty, $remise_percent=0)
+	{
+		global $conf, $mysoc;
+
+		if (! $qty) $qty = 1;
+
+		dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
+		if ($idproduct > 0)
+		{
+			$prod=new Product($this->db);
+			$prod->fetch($idproduct);
+
+			$productdesc = $prod->description;
+
+			$tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
+			$tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
+			if (empty($tva_tx)) $tva_npr=0;
+			$localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
+			$localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
+
+			// multiprix
+			if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
+			{
+				$price = $prod->multiprices[$this->thirdparty->price_level];
+			}
+			else
+			{
+				$price = $prod->price;
+			}
+
+			$line = new SupplierProposalLine($this->db);
+
+			$line->fk_product=$idproduct;
+			$line->desc=$productdesc;
+			$line->qty=$qty;
+			$line->subprice=$price;
+			$line->remise_percent=$remise_percent;
+			$line->tva_tx=$tva_tx;
+
+			$this->lines[]=$line;
+		}
+	}
+
+	/**
+	 *	Adding line of fixed discount in the proposal in DB
+	 *
+	 *	@param     int		$idremise			Id of fixed discount
+	 *  @return    int          				>0 if OK, <0 if KO
+	 */
+	function insert_discount($idremise)
+	{
+		global $langs;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		$this->db->begin();
+
+		$remise=new DiscountAbsolute($this->db);
+		$result=$remise->fetch($idremise);
+
+		if ($result > 0)
+		{
+			if ($remise->fk_facture)	// Protection against multiple submission
+			{
+				$this->error=$langs->trans("ErrorDiscountAlreadyUsed");
+				$this->db->rollback();
+				return -5;
+			}
+
+			$supplier_proposalligne=new SupplierProposalLine($this->db);
+			$supplier_proposalligne->fk_supplier_proposal=$this->id;
+			$supplier_proposalligne->fk_remise_except=$remise->id;
+			$supplier_proposalligne->desc=$remise->description;   	// Description ligne
+			$supplier_proposalligne->tva_tx=$remise->tva_tx;
+			$supplier_proposalligne->subprice=-$remise->amount_ht;
+			$supplier_proposalligne->fk_product=0;					// Id produit predefini
+			$supplier_proposalligne->qty=1;
+			$supplier_proposalligne->remise=0;
+			$supplier_proposalligne->remise_percent=0;
+			$supplier_proposalligne->rang=-1;
+			$supplier_proposalligne->info_bits=2;
+
+			// TODO deprecated
+			$supplier_proposalligne->price=-$remise->amount_ht;
+
+			$supplier_proposalligne->total_ht  = -$remise->amount_ht;
+			$supplier_proposalligne->total_tva = -$remise->amount_tva;
+			$supplier_proposalligne->total_ttc = -$remise->amount_ttc;
+
+			$result=$supplier_proposalligne->insert();
+			if ($result > 0)
+			{
+				$result=$this->update_price(1);
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->error=$supplier_proposalligne->error;
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 *    	Add a proposal line into database (linked to product/service or not)
+	 * 		Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+	 *		de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
+	 *		par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit)
+	 *		et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
+	 *
+	 * 		@param    	string		$desc				Description de la ligne
+	 * 		@param    	double		$pu_ht				Prix unitaire
+	 * 		@param    	double		$qty             	Quantite
+	 * 		@param    	double		$txtva           	Taux de tva
+	 * 		@param		double		$txlocaltax1		Local tax 1 rate
+	 *  	@param		double		$txlocaltax2		Local tax 2 rate
+	 *		@param    	int			$fk_product      	Id du produit/service predefini
+	 * 		@param    	double		$remise_percent  	Pourcentage de remise de la ligne
+	 * 		@param    	string		$price_base_type	HT or TTC
+	 * 		@param    	double		$pu_ttc             Prix unitaire TTC
+	 * 		@param    	int			$info_bits			Bits de type de lignes
+	 *      @param      int			$type               Type of line (product, service)
+	 *      @param      int			$rang               Position of line
+	 *      @param		int			$special_code		Special code (also used by externals modules!)
+	 *      @param		int			$fk_parent_line		Id of parent line
+	 *      @param		int			$fk_fournprice		Id supplier price
+	 *      @param		int			$pa_ht				Buying price without tax
+	 *      @param		string		$label				???
+	 *      @param		array		$array_option		extrafields array
 	 * 		@param		string		$ref_fourn			Supplier price reference
 	 * 		@param		int			$fk_unit			Id of the unit to use.
 	 * 		@param		string		$origin				'order', 'supplier_proposal', ...
 	 * 		@param		int			$origin_id			Id of origin line
-     *    	@return    	int         	    			>0 if OK, <0 if KO
-     *
-     *    	@see       	add_product
-     */
-    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin='', $origin_id=0)
-    {
-    	global $mysoc;
-
-        dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
-        $txtva=price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-    		$pa_ht=price2num($pa_ht);
-        if ($price_base_type=='HT')
-        {
-            $pu=$pu_ht;
-        }
-        else
-        {
-            $pu=$pu_ttc;
-        }
-
-        // Check parameters
-        if ($type < 0) return -1;
-
-        if ($this->statut == 0)
-        {
-            $this->db->begin();
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et txtva
-            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
-            $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
-
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
+	 *    	@return    	int         	    			>0 if OK, <0 if KO
+	 *
+	 *    	@see       	add_product
+	 */
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin='', $origin_id=0)
+	{
+		global $mysoc;
+
+		dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		// Clean parameters
+		if (empty($remise_percent)) $remise_percent=0;
+		if (empty($qty)) $qty=0;
+		if (empty($info_bits)) $info_bits=0;
+		if (empty($rang)) $rang=0;
+		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+
+		$remise_percent=price2num($remise_percent);
+		$qty=price2num($qty);
+		$pu_ht=price2num($pu_ht);
+		$pu_ttc=price2num($pu_ttc);
+		$txtva=price2num($txtva);
+		$txlocaltax1=price2num($txlocaltax1);
+		$txlocaltax2=price2num($txlocaltax2);
+			$pa_ht=price2num($pa_ht);
+		if ($price_base_type=='HT')
+		{
+			$pu=$pu_ht;
+		}
+		else
+		{
+			$pu=$pu_ttc;
+		}
+
+		// Check parameters
+		if ($type < 0) return -1;
+
+		if ($this->statut == 0)
+		{
+			$this->db->begin();
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
+			$txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
+
+			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
-
-            // Rang to use
-            $rangtouse = $rang;
-            if ($rangtouse == -1)
-            {
-                $rangmax = $this->line_max($fk_parent_line);
-                $rangtouse = $rangmax + 1;
-            }
-
-            // TODO A virer
-            // Anciens indicateurs: $price, $remise (a ne plus utiliser)
-            $price = $pu;
-            $remise = 0;
-            if ($remise_percent > 0)
-            {
-                $remise = round(($pu * $remise_percent / 100), 2);
-                $price = $pu - $remise;
-            }
-
-            // Insert line
-            $this->line=new SupplierProposalLine($this->db);
-
-            $this->line->fk_supplier_proposal=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$txlocaltax1;
-            $this->line->localtax2_tx=$txlocaltax2;
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+
+			// Rang to use
+			$rangtouse = $rang;
+			if ($rangtouse == -1)
+			{
+				$rangmax = $this->line_max($fk_parent_line);
+				$rangtouse = $rangmax + 1;
+			}
+
+			// TODO A virer
+			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
+			$price = $pu;
+			$remise = 0;
+			if ($remise_percent > 0)
+			{
+				$remise = round(($pu * $remise_percent / 100), 2);
+				$price = $pu - $remise;
+			}
+
+			// Insert line
+			$this->line=new SupplierProposalLine($this->db);
+
+			$this->line->fk_supplier_proposal=$this->id;
+			$this->line->label=$label;
+			$this->line->desc=$desc;
+			$this->line->qty=$qty;
+			$this->line->tva_tx=$txtva;
+			$this->line->localtax1_tx=$txlocaltax1;
+			$this->line->localtax2_tx=$txlocaltax2;
 			$this->line->localtax1_type = $localtaxes_type[0];
 			$this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-            $this->line->remise_percent=$remise_percent;
-            $this->line->subprice=$pu_ht;
-            $this->line->rang=$rangtouse;
-            $this->line->info_bits=$info_bits;
-            $this->line->total_ht=$total_ht;
-            $this->line->total_tva=$total_tva;
-            $this->line->total_localtax1=$total_localtax1;
-            $this->line->total_localtax2=$total_localtax2;
-            $this->line->total_ttc=$total_ttc;
-            $this->line->product_type=$type;
-            $this->line->special_code=$special_code;
-            $this->line->fk_parent_line=$fk_parent_line;
-            $this->line->fk_unit=$fk_unit;
-            $this->line->origin=$origin;
-            $this->line->origin_id=$origin_id;
+			$this->line->fk_product=$fk_product;
+			$this->line->remise_percent=$remise_percent;
+			$this->line->subprice=$pu_ht;
+			$this->line->rang=$rangtouse;
+			$this->line->info_bits=$info_bits;
+			$this->line->total_ht=$total_ht;
+			$this->line->total_tva=$total_tva;
+			$this->line->total_localtax1=$total_localtax1;
+			$this->line->total_localtax2=$total_localtax2;
+			$this->line->total_ttc=$total_ttc;
+			$this->line->product_type=$type;
+			$this->line->special_code=$special_code;
+			$this->line->fk_parent_line=$fk_parent_line;
+			$this->line->fk_unit=$fk_unit;
+			$this->line->origin=$origin;
+			$this->line->origin_id=$origin_id;
 			$this->line->ref_fourn = $this->db->escape($ref_fourn);
 
 			// infos marge
 			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-			    // by external module, take lowest buying price
-			    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+				// by external module, take lowest buying price
+				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+				$productFournisseur = new ProductFournisseur($this->db);
+				$productFournisseur->find_min_price_product_fournisseur($fk_product);
+				$this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
 			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
+				$this->line->fk_fournprice = $fk_fournprice;
 			}
 			$this->line->pa_ht = $pa_ht;
 
@@ -485,279 +485,279 @@ 
 			$this->line->multicurrency_code			= $this->multicurrency_code;
 			$this->line->multicurrency_subprice		= price2num($pu_ht * $this->multicurrency_tx);
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-            // Mise en option de la ligne
-            if (empty($qty) && empty($special_code)) $this->line->special_code=3;
-
-            // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
-
-            if (is_array($array_option) && count($array_option)>0) {
-            	$this->line->array_options=$array_option;
-            }
-
-            $result=$this->line->insert();
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-                // Mise a jour informations denormalisees au niveau de la propale meme
-                $result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-                if ($result > 0)
-                {
-                    $this->db->commit();
-                    return $this->line->rowid;
-                }
-                else
-                {
-                    $this->error=$this->db->error();
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error=$this->line->error;
-                $this->db->rollback();
-                return -2;
-            }
-        }
-    }
-
-
-    /**
-     *  Update a proposal line
-     *
-     *  @param      int			$rowid           	Id de la ligne
-     *  @param      double		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
-     *  @param      double		$qty            	Quantity
-     *  @param      double		$remise_percent  	Remise effectuee sur le produit
-     *  @param      double		$txtva	          	Taux de TVA
-     * 	@param	  	double		$txlocaltax1		Local tax 1 rate
-     *  @param	  	double		$txlocaltax2		Local tax 2 rate
-     *  @param      string		$desc            	Description
-     *	@param	  	double		$price_base_type	HT ou TTC
-     *	@param      int			$info_bits        	Miscellaneous informations
-     *	@param		int			$special_code		Special code (also used by externals modules!)
-     * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
-     * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
-     *  @param		int			$fk_fournprice		Id of origin supplier price
-     *  @param		int			$pa_ht				Price (without tax) of product when it was bought
-     *  @param		string		$label				???
-     *  @param		int			$type				0/1=Product/service
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			// Mise en option de la ligne
+			if (empty($qty) && empty($special_code)) $this->line->special_code=3;
+
+			// TODO deprecated
+			$this->line->price=$price;
+			$this->line->remise=$remise;
+
+			if (is_array($array_option) && count($array_option)>0) {
+				$this->line->array_options=$array_option;
+			}
+
+			$result=$this->line->insert();
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+				// Mise a jour informations denormalisees au niveau de la propale meme
+				$result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return $this->line->rowid;
+				}
+				else
+				{
+					$this->error=$this->db->error();
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->error=$this->line->error;
+				$this->db->rollback();
+				return -2;
+			}
+		}
+	}
+
+
+	/**
+	 *  Update a proposal line
+	 *
+	 *  @param      int			$rowid           	Id de la ligne
+	 *  @param      double		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
+	 *  @param      double		$qty            	Quantity
+	 *  @param      double		$remise_percent  	Remise effectuee sur le produit
+	 *  @param      double		$txtva	          	Taux de TVA
+	 * 	@param	  	double		$txlocaltax1		Local tax 1 rate
+	 *  @param	  	double		$txlocaltax2		Local tax 2 rate
+	 *  @param      string		$desc            	Description
+	 *	@param	  	double		$price_base_type	HT ou TTC
+	 *	@param      int			$info_bits        	Miscellaneous informations
+	 *	@param		int			$special_code		Special code (also used by externals modules!)
+	 * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
+	 * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
+	 *  @param		int			$fk_fournprice		Id of origin supplier price
+	 *  @param		int			$pa_ht				Price (without tax) of product when it was bought
+	 *  @param		string		$label				???
+	 *  @param		int			$type				0/1=Product/service
 	 *  @param		array		$array_option		extrafields array
 	 * 	@param		string		$ref_fourn			Supplier price reference
 	 *	@param		int			$fk_unit			Id of the unit to use.
-     *  @return     int     		        		0 if OK, <0 if KO
-     */
+	 *  @return     int     		        		0 if OK, <0 if KO
+	 */
 	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $array_option=0, $ref_fourn='', $fk_unit='')
-    {
-        global $conf,$user,$langs, $mysoc;
-
-        dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        // Clean parameters
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu = price2num($pu);
-        $txtva = price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-    	$pa_ht=price2num($pa_ht);
-        if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
-        if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
-
-        if ($this->statut == 0)
-        {
-            $this->db->begin();
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et txtva
-            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
-            $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
-
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
+	{
+		global $conf,$user,$langs, $mysoc;
+
+		dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		// Clean parameters
+		$remise_percent=price2num($remise_percent);
+		$qty=price2num($qty);
+		$pu = price2num($pu);
+		$txtva = price2num($txtva);
+		$txlocaltax1=price2num($txlocaltax1);
+		$txlocaltax2=price2num($txlocaltax2);
+		$pa_ht=price2num($pa_ht);
+		if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
+		if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
+
+		if ($this->statut == 0)
+		{
+			$this->db->begin();
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
+			$txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
+
+			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
-
-            // Anciens indicateurs: $price, $remise (a ne plus utiliser)
-            $price = $pu;
-            if ($remise_percent > 0)
-            {
-                $remise = round(($pu * $remise_percent / 100), 2);
-                $price = $pu - $remise;
-            }
-
-            // Update line
-            $this->line=new SupplierProposalLine($this->db);
-
-            // Stock previous line records
-            $staticline=new SupplierProposalLine($this->db);
-            $staticline->fetch($rowid);
-            $this->line->oldline = $staticline;
-
-            // Reorder if fk_parent_line change
-            if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
-            {
-                $rangmax = $this->line_max($fk_parent_line);
-                $this->line->rang = $rangmax + 1;
-            }
-
-            $this->line->rowid				= $rowid;
-            $this->line->label				= $label;
-            $this->line->desc				= $desc;
-            $this->line->qty				= $qty;
-            $this->line->product_type			= $type;
-            $this->line->tva_tx				= $txtva;
-            $this->line->localtax1_tx		= $txlocaltax1;
-            $this->line->localtax2_tx		= $txlocaltax2;
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+
+			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
+			$price = $pu;
+			if ($remise_percent > 0)
+			{
+				$remise = round(($pu * $remise_percent / 100), 2);
+				$price = $pu - $remise;
+			}
+
+			// Update line
+			$this->line=new SupplierProposalLine($this->db);
+
+			// Stock previous line records
+			$staticline=new SupplierProposalLine($this->db);
+			$staticline->fetch($rowid);
+			$this->line->oldline = $staticline;
+
+			// Reorder if fk_parent_line change
+			if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
+			{
+				$rangmax = $this->line_max($fk_parent_line);
+				$this->line->rang = $rangmax + 1;
+			}
+
+			$this->line->rowid				= $rowid;
+			$this->line->label				= $label;
+			$this->line->desc				= $desc;
+			$this->line->qty				= $qty;
+			$this->line->product_type			= $type;
+			$this->line->tva_tx				= $txtva;
+			$this->line->localtax1_tx		= $txlocaltax1;
+			$this->line->localtax2_tx		= $txlocaltax2;
 			$this->line->localtax1_type		= $localtaxes_type[0];
 			$this->line->localtax2_type		= $localtaxes_type[2];
-            $this->line->remise_percent		= $remise_percent;
-            $this->line->subprice			= $pu;
-            $this->line->info_bits			= $info_bits;
-            $this->line->total_ht			= $total_ht;
-            $this->line->total_tva			= $total_tva;
-            $this->line->total_localtax1	= $total_localtax1;
-            $this->line->total_localtax2	= $total_localtax2;
-            $this->line->total_ttc			= $total_ttc;
-            $this->line->special_code		= $special_code;
-            $this->line->fk_parent_line		= $fk_parent_line;
-            $this->line->skip_update_total	= $skip_update_total;
-            $this->line->ref_fourn			= $ref_fourn;
+			$this->line->remise_percent		= $remise_percent;
+			$this->line->subprice			= $pu;
+			$this->line->info_bits			= $info_bits;
+			$this->line->total_ht			= $total_ht;
+			$this->line->total_tva			= $total_tva;
+			$this->line->total_localtax1	= $total_localtax1;
+			$this->line->total_localtax2	= $total_localtax2;
+			$this->line->total_ttc			= $total_ttc;
+			$this->line->special_code		= $special_code;
+			$this->line->fk_parent_line		= $fk_parent_line;
+			$this->line->skip_update_total	= $skip_update_total;
+			$this->line->ref_fourn			= $ref_fourn;
 			$this->line->fk_unit			= $fk_unit;
 
-            // infos marge
-            if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-                // by external module, take lowest buying price
-                include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+			// infos marge
+			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+				// by external module, take lowest buying price
+				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+				$productFournisseur = new ProductFournisseur($this->db);
+				$productFournisseur->find_min_price_product_fournisseur($fk_product);
+				$this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
 			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
+				$this->line->fk_fournprice = $fk_fournprice;
 			}
-            $this->line->pa_ht = $pa_ht;
+			$this->line->pa_ht = $pa_ht;
 
-            // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+			// TODO deprecated
+			$this->line->price=$price;
+			$this->line->remise=$remise;
 
-            if (is_array($array_option) && count($array_option)>0) {
-            	$this->line->array_options=$array_option;
-            }
+			if (is_array($array_option) && count($array_option)>0) {
+				$this->line->array_options=$array_option;
+			}
 
 			// Multicurrency
 			$this->line->multicurrency_subprice		= price2num($pu * $this->multicurrency_tx);
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-            $result=$this->line->update();
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-                $this->update_price(1);
-
-                $this->fk_supplier_proposal = $this->id;
-                $this->rowid = $rowid;
-
-                $this->db->commit();
-                return $result;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
-            return -2;
-        }
-    }
-
-
-    /**
-     *  Delete detail line
-     *
-     *  @param		int		$lineid			Id of line to delete
-     *  @return     int         			>0 if OK, <0 if KO
-     */
-    function deleteline($lineid)
-    {
-        if ($this->statut == 0)
-        {
-            $line=new SupplierProposalLine($this->db);
-
-            // For triggers
-            $line->fetch($lineid);
-
-            if ($line->delete() > 0)
-            {
-                $this->update_price(1);
-
-                return 1;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
-
-
-    /**
-     *  Create commercial proposal into database
-     * 	this->ref can be set or empty. If empty, we will use "(PROVid)"
-     *
-     * 	@param		User	$user		User that create
-     * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *  @return     int     			<0 if KO, >=0 if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        global $langs,$conf,$mysoc,$hookmanager;
-        $error=0;
-
-        $now=dol_now();
-
-        dol_syslog(get_class($this)."::create");
-
-        // Check parameters
-        $result=$this->fetch_thirdparty();
-        if ($result < 0)
-        {
-            $this->error="Failed to fetch company";
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -3;
-        }
-
-        // Check parameters
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			$result=$this->line->update();
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+				$this->update_price(1);
+
+				$this->fk_supplier_proposal = $this->id;
+				$this->rowid = $rowid;
+
+				$this->db->commit();
+				return $result;
+			}
+			else
+			{
+				$this->error=$this->db->error();
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
+			return -2;
+		}
+	}
+
+
+	/**
+	 *  Delete detail line
+	 *
+	 *  @param		int		$lineid			Id of line to delete
+	 *  @return     int         			>0 if OK, <0 if KO
+	 */
+	function deleteline($lineid)
+	{
+		if ($this->statut == 0)
+		{
+			$line=new SupplierProposalLine($this->db);
+
+			// For triggers
+			$line->fetch($lineid);
+
+			if ($line->delete() > 0)
+			{
+				$this->update_price(1);
+
+				return 1;
+			}
+			else
+			{
+				return -1;
+			}
+		}
+		else
+		{
+			return -2;
+		}
+	}
+
+
+	/**
+	 *  Create commercial proposal into database
+	 * 	this->ref can be set or empty. If empty, we will use "(PROVid)"
+	 *
+	 * 	@param		User	$user		User that create
+	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @return     int     			<0 if KO, >=0 if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $langs,$conf,$mysoc,$hookmanager;
+		$error=0;
+
+		$now=dol_now();
+
+		dol_syslog(get_class($this)."::create");
+
+		// Check parameters
+		$result=$this->fetch_thirdparty();
+		if ($result < 0)
+		{
+			$this->error="Failed to fetch company";
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -3;
+		}
+
+		// Check parameters
 		if (! empty($this->ref))	// We check that ref is not already used
 		{
 			$result=self::isExistingObject($this->element, 0, $this->ref);	// Check ref is not yet used
@@ -779,89 +779,89 @@ 
 			$this->multicurrency_tx = 1;
 		}
 
-        $this->db->begin();
-
-        // Insert into database
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
-        $sql.= "fk_soc";
-        $sql.= ", price";
-        $sql.= ", remise";
-        $sql.= ", remise_percent";
-        $sql.= ", remise_absolue";
-        $sql.= ", tva";
-        $sql.= ", total";
-        $sql.= ", datec";
-        $sql.= ", ref";
-        $sql.= ", fk_user_author";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", model_pdf";
-        $sql.= ", fk_cond_reglement";
-        $sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", date_livraison";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_projet";
-        $sql.= ", entity";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ") ";
-        $sql.= " VALUES (";
-        $sql.= $this->socid;
-        $sql.= ", 0";
-        $sql.= ", ".$this->remise;
-        $sql.= ", ".($this->remise_percent?$this->db->escape($this->remise_percent):'null');
-        $sql.= ", ".($this->remise_absolue?$this->db->escape($this->remise_absolue):'null');
-        $sql.= ", 0";
-        $sql.= ", 0";
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", '(PROV)'";
-        $sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql.= ", ".$this->cond_reglement_id;
-        $sql.= ", ".$this->mode_reglement_id;
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".$conf->entity;
+		$this->db->begin();
+
+		// Insert into database
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
+		$sql.= "fk_soc";
+		$sql.= ", price";
+		$sql.= ", remise";
+		$sql.= ", remise_percent";
+		$sql.= ", remise_absolue";
+		$sql.= ", tva";
+		$sql.= ", total";
+		$sql.= ", datec";
+		$sql.= ", ref";
+		$sql.= ", fk_user_author";
+		$sql.= ", note_private";
+		$sql.= ", note_public";
+		$sql.= ", model_pdf";
+		$sql.= ", fk_cond_reglement";
+		$sql.= ", fk_mode_reglement";
+		$sql.= ", fk_account";
+		$sql.= ", date_livraison";
+		$sql.= ", fk_shipping_method";
+		$sql.= ", fk_projet";
+		$sql.= ", entity";
+		$sql.= ", fk_multicurrency";
+		$sql.= ", multicurrency_code";
+		$sql.= ", multicurrency_tx";
+		$sql.= ") ";
+		$sql.= " VALUES (";
+		$sql.= $this->socid;
+		$sql.= ", 0";
+		$sql.= ", ".$this->remise;
+		$sql.= ", ".($this->remise_percent?$this->db->escape($this->remise_percent):'null');
+		$sql.= ", ".($this->remise_absolue?$this->db->escape($this->remise_absolue):'null');
+		$sql.= ", 0";
+		$sql.= ", 0";
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", '(PROV)'";
+		$sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
+		$sql.= ", '".$this->db->escape($this->note_private)."'";
+		$sql.= ", '".$this->db->escape($this->note_public)."'";
+		$sql.= ", '".$this->db->escape($this->modelpdf)."'";
+		$sql.= ", ".$this->cond_reglement_id;
+		$sql.= ", ".$this->mode_reglement_id;
+		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null");
+		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
+		$sql.= ", ".($this->fk_project?$this->fk_project:"null");
+		$sql.= ", ".$conf->entity;
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+		$sql.= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."supplier_proposal");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."supplier_proposal");
 
-            if ($this->id)
-            {
-                $this->ref='(PROV'.$this->id.')';
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+			if ($this->id)
+			{
+				$this->ref='(PROV'.$this->id.')';
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
-                dol_syslog(get_class($this)."::create", LOG_DEBUG);
-                $resql=$this->db->query($sql);
-                if (! $resql) $error++;
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
+				$resql=$this->db->query($sql);
+				if (! $resql) $error++;
 
-                /*
+				/*
                  *  Insertion du detail des produits dans la base
                 */
-                if (! $error)
-                {
-                    $fk_parent_line=0;
-                    $num=count($this->lines);
-
-                    for ($i=0;$i<$num;$i++)
-                    {
-                        // Reset fk_parent_line for no child products and special product
-                        if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
-                            $fk_parent_line = 0;
-                        }
+				if (! $error)
+				{
+					$fk_parent_line=0;
+					$num=count($this->lines);
+
+					for ($i=0;$i<$num;$i++)
+					{
+						// Reset fk_parent_line for no child products and special product
+						if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
+							$fk_parent_line = 0;
+						}
 
 						$result = $this->addline(
 							$this->lines[$i]->desc,
@@ -889,122 +889,122 @@ 
 							$this->lines[$i]->rowid
 						);
 
-                        if ($result < 0)
-                        {
-                            $error++;
-                            $this->error=$this->db->error;
-                            dol_print_error($this->db);
-                            break;
-                        }
-                        // Defined the new fk_parent_line
-                        if ($result > 0 && $this->lines[$i]->product_type == 9) {
-                            $fk_parent_line = $result;
-                        }
-                    }
-                }
-
-                // Add linked object
-                if (! $error && $this->origin && $this->origin_id)
-                {
-                    $ret = $this->add_object_linked();
-                    if (! $ret)	dol_print_error($this->db);
-                }
-
-                if (! $error)
-                {
-                    // Mise a jour infos denormalisees
-                    $resql=$this->update_price(1);
-                    if ($resql)
-                    {
-                    	$action='update';
-
-                    	// Actions on extra fields (by external module or standard code)
-                    	$hookmanager->initHooks(array('supplier_proposaldao'));
-                    	$parameters=array('socid'=>$this->id);
-                    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                    	if (empty($reshook))
-                    	{
-                    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-                    		{
-                    			$result=$this->insertExtraFields();
-                    			if ($result < 0)
-                    			{
-                    				$error++;
-                    			}
-                    		}
-                    	}
-                    	else if ($reshook < 0) $error++;
-
-                        if (! $notrigger)
-                        {
-                            // Call trigger
-                            $result=$this->call_trigger('PROPAL_SUPPLIER_CREATE',$user);
-                            if ($result < 0) { $error++; }
-                            // End call triggers
-                        }
-                    }
-                    else
+						if ($result < 0)
+						{
+							$error++;
+							$this->error=$this->db->error;
+							dol_print_error($this->db);
+							break;
+						}
+						// Defined the new fk_parent_line
+						if ($result > 0 && $this->lines[$i]->product_type == 9) {
+							$fk_parent_line = $result;
+						}
+					}
+				}
+
+				// Add linked object
+				if (! $error && $this->origin && $this->origin_id)
+				{
+					$ret = $this->add_object_linked();
+					if (! $ret)	dol_print_error($this->db);
+				}
+
+				if (! $error)
+				{
+					// Mise a jour infos denormalisees
+					$resql=$this->update_price(1);
+					if ($resql)
+					{
+						$action='update';
+
+						// Actions on extra fields (by external module or standard code)
+						$hookmanager->initHooks(array('supplier_proposaldao'));
+						$parameters=array('socid'=>$this->id);
+						$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+						if (empty($reshook))
+						{
+							if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+							{
+								$result=$this->insertExtraFields();
+								if ($result < 0)
+								{
+									$error++;
+								}
+							}
+						}
+						else if ($reshook < 0) $error++;
+
+						if (! $notrigger)
+						{
+							// Call trigger
+							$result=$this->call_trigger('PROPAL_SUPPLIER_CREATE',$user);
+							if ($result < 0) { $error++; }
+							// End call triggers
+						}
+					}
+					else
 					{
-                        $this->error=$this->db->lasterror();
-                        $error++;
-                    }
-                }
-            }
-            else
-			{
-                $this->error=$this->db->lasterror();
-                $error++;
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-                dol_syslog(get_class($this)."::create done id=".$this->id);
-                return $this->id;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
-     *
-     *	@param 		User	$user	User that create
-     *	@return    	int				Id of the new object if ok, <0 if ko
-     *	@see       	create
-     */
-    function create_from($user)
-    {
-        $this->products=$this->lines;
-
-        return $this->create($user);
-    }
-
-    /**
-     *		Load an object from its id and create a new one in database
-     *
-     *		@param		int				$socid			Id of thirdparty
-     * 	 	@return		int								New id of clone
-     */
-    function createFromClone($socid=0)
-    {
-        global $user,$langs,$conf,$hookmanager;
-
-        $error=0;
-        $now=dol_now();
-
-        $this->db->begin();
+						$this->error=$this->db->lasterror();
+						$error++;
+					}
+				}
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				dol_syslog(get_class($this)."::create done id=".$this->id);
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
+	 *
+	 *	@param 		User	$user	User that create
+	 *	@return    	int				Id of the new object if ok, <0 if ko
+	 *	@see       	create
+	 */
+	function create_from($user)
+	{
+		$this->products=$this->lines;
+
+		return $this->create($user);
+	}
+
+	/**
+	 *		Load an object from its id and create a new one in database
+	 *
+	 *		@param		int				$socid			Id of thirdparty
+	 * 	 	@return		int								New id of clone
+	 */
+	function createFromClone($socid=0)
+	{
+		global $user,$langs,$conf,$hookmanager;
+
+		$error=0;
+		$now=dol_now();
+
+		$this->db->begin();
 
 		// get extrafields so they will be clone
 		foreach($this->lines as $line)
@@ -1013,258 +1013,258 @@ 
 		// Load source object
 		$objFrom = clone $this;
 
-        $objsoc=new Societe($this->db);
-
-        // Change socid if needed
-        if (! empty($socid) && $socid != $this->socid)
-        {
-            if ($objsoc->fetch($socid) > 0)
-            {
-                $this->socid 				= $objsoc->id;
-                $this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                $this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $this->fk_project			= '';
-            }
-
-            // TODO Change product price if multi-prices
-        }
-        else
-        {
-            $objsoc->fetch($this->socid);
-        }
-
-        $this->id=0;
-        $this->statut=0;
-
-        if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
-        {
-            $this->error='ErrorSetupNotComplete';
-            return -1;
-        }
-
-        // Clear fields
-        $this->user_author	= $user->id;
-        $this->user_valid	= '';
-        $this->date			= $now;
-
-        // Set ref
-        require_once DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
-        $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
-        $modSupplierProposal = new $obj;
-        $this->ref = $modSupplierProposal->getNextValue($objsoc,$this);
-
-        // Create clone
-        $result=$this->create($user);
-        if ($result < 0) $error++;
-
-        if (! $error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
-
-            // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PROPOSAL_CLONE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-
-        // End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Load a proposal from database and its ligne array
-     *
-     *	@param      int			$rowid		id of object to load
-     *	@param		string		$ref		Ref of proposal
-     *	@return     int         			>0 if OK, <0 if KO
-     */
-    function fetch($rowid,$ref='')
-    {
-        global $conf;
-
-        $sql = "SELECT p.rowid, p.ref, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
-        $sql.= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
-        $sql.= ", p.datec";
-        $sql.= ", p.date_valid as datev";
-        $sql.= ", p.date_livraison as date_livraison";
-        $sql.= ", p.model_pdf, p.extraparams";
-        $sql.= ", p.note_private, p.note_public";
-        $sql.= ", p.fk_projet, p.fk_statut";
-        $sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
-        $sql.= ", p.fk_cond_reglement";
-        $sql.= ", p.fk_mode_reglement";
-        $sql.= ', p.fk_account';
-        $sql.= ", p.fk_shipping_method";
-		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
-        $sql.= ", c.label as statut_label";
-        $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
-        $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN (' . getEntity('c_paiement').')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term').')';
-        $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity = ".$conf->entity;
-        if ($ref) $sql.= " AND p.ref='".$ref."'";
-        else $sql.= " AND p.rowid=".$rowid;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id                   = $obj->rowid;
-
-                $this->ref                  = $obj->ref;
-                $this->remise               = $obj->remise;
-                $this->remise_percent       = $obj->remise_percent;
-                $this->remise_absolue       = $obj->remise_absolue;
-                $this->total                = $obj->total; // TODO deprecated
-                $this->total_ht             = $obj->total_ht;
-                $this->total_tva            = $obj->tva;
-                $this->total_localtax1		= $obj->localtax1;
-                $this->total_localtax2		= $obj->localtax2;
-                $this->total_ttc            = $obj->total;
-                $this->socid                = $obj->fk_soc;
-                $this->fk_project           = $obj->fk_projet;
-                $this->modelpdf             = $obj->model_pdf;
-                $this->note                 = $obj->note_private; // TODO deprecated
-                $this->note_private         = $obj->note_private;
-                $this->note_public          = $obj->note_public;
-                $this->statut               = (int) $obj->fk_statut;
-                $this->statut_libelle       = $obj->statut_label;
-                $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
-                $this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
-                $this->date_creation		= $this->db->jdate($obj->datec); //Creation date
-                $this->date_validation		= $this->db->jdate($obj->datev); //Validation date
-                $this->date_livraison       = $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-
-                $this->mode_reglement_id    = $obj->fk_mode_reglement;
-                $this->mode_reglement_code  = $obj->mode_reglement_code;
-                $this->mode_reglement       = $obj->mode_reglement;
-                $this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
-                $this->cond_reglement_id    = $obj->fk_cond_reglement;
-                $this->cond_reglement_code  = $obj->cond_reglement_code;
-                $this->cond_reglement       = $obj->cond_reglement;
-                $this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
-
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
-
-                $this->user_author_id = $obj->fk_user_author;
-                $this->user_valid_id  = $obj->fk_user_valid;
-                $this->user_close_id  = $obj->fk_user_cloture;
+		$objsoc=new Societe($this->db);
 
-				// Multicurrency
-				$this->fk_multicurrency 		= $obj->fk_multicurrency;
-				$this->multicurrency_code 		= $obj->multicurrency_code;
-				$this->multicurrency_tx 		= $obj->multicurrency_tx;
-				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
-				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+		// Change socid if needed
+		if (! empty($socid) && $socid != $this->socid)
+		{
+			if ($objsoc->fetch($socid) > 0)
+			{
+				$this->socid 				= $objsoc->id;
+				$this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$this->fk_project			= '';
+			}
 
-                if ($obj->fk_statut == 0)
-                {
-                    $this->brouillon = 1;
-                }
+			// TODO Change product price if multi-prices
+		}
+		else
+		{
+			$objsoc->fetch($this->socid);
+		}
 
-                // Retreive all extrafield for invoice
-                // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+		$this->id=0;
+		$this->statut=0;
 
-                $this->db->free($resql);
+		if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
+		{
+			$this->error='ErrorSetupNotComplete';
+			return -1;
+		}
 
-                $this->lines = array();
+		// Clear fields
+		$this->user_author	= $user->id;
+		$this->user_valid	= '';
+		$this->date			= $now;
 
-                /*
-                 * Lignes askprice liees a un produit ou non
-                 */
-                $sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
-				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
-                $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-                $sql.= ' d.ref_fourn as ref_produit_fourn,';
-				$sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
-                $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-                $sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
-                $sql.= " ORDER by d.rang";
-
-                $result = $this->db->query($sql);
-                if ($result)
-                {
-                    $num = $this->db->num_rows($result);
-                    $i = 0;
-
-                    while ($i < $num)
-                    {
-                        $objp                   = $this->db->fetch_object($result);
-
-                        $line                   = new SupplierProposalLine($this->db);
-
-                        $line->rowid			= $objp->rowid; // deprecated
-                        $line->id				= $objp->rowid;
-                        $line->fk_supplier_proposal		= $objp->fk_supplier_proposal;
-                        $line->fk_parent_line	= $objp->fk_parent_line;
-                        $line->product_type     = $objp->product_type;
-                        $line->label            = $objp->custom_label;
-                        $line->desc             = $objp->description;  // Description ligne
-                        $line->qty              = $objp->qty;
-                        $line->tva_tx           = $objp->tva_tx;
-                        $line->localtax1_tx		= $objp->localtax1_tx;
-                        $line->localtax2_tx		= $objp->localtax2_tx;
-                        $line->subprice         = $objp->subprice;
-                        $line->fk_remise_except = $objp->fk_remise_except;
-                        $line->remise_percent   = $objp->remise_percent;
-                        $line->price            = $objp->price;		// TODO deprecated
-
-                        $line->info_bits        = $objp->info_bits;
-                        $line->total_ht         = $objp->total_ht;
-                        $line->total_tva        = $objp->total_tva;
-                        $line->total_localtax1	= $objp->total_localtax1;
-                        $line->total_localtax2	= $objp->total_localtax2;
-                        $line->total_ttc        = $objp->total_ttc;
-      					$line->fk_fournprice 	= $objp->fk_fournprice;
-						$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-						$line->pa_ht 			= $marginInfos[0];
-						$line->marge_tx			= $marginInfos[1];
-						$line->marque_tx		= $marginInfos[2];
-                        $line->special_code     = $objp->special_code;
-                        $line->rang             = $objp->rang;
+		// Set ref
+		require_once DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
+		$obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
+		$modSupplierProposal = new $obj;
+		$this->ref = $modSupplierProposal->getNextValue($objsoc,$this);
 
-                        $line->fk_product       = $objp->fk_product;
+		// Create clone
+		$result=$this->create($user);
+		if ($result < 0) $error++;
 
-                        $line->ref				= $objp->product_ref;		// TODO deprecated
-                        $line->product_ref		= $objp->product_ref;
-                        $line->libelle			= $objp->product_label;		// TODO deprecated
-                        $line->product_label	= $objp->product_label;
-                        $line->product_desc     = $objp->product_desc; 		// Description produit
-                        $line->fk_product_type  = $objp->fk_product_type;
+		if (! $error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters=array('objFrom'=>$objFrom);
+				$action='';
+				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
 
-						$line->ref_fourn		= $objp->ref_produit_fourn;
+			// Call trigger
+			$result=$this->call_trigger('SUPPLIER_PROPOSAL_CLONE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
 
-						// Multicurrency
-						$line->fk_multicurrency 		= $objp->fk_multicurrency;
+		// End
+		if (! $error)
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Load a proposal from database and its ligne array
+	 *
+	 *	@param      int			$rowid		id of object to load
+	 *	@param		string		$ref		Ref of proposal
+	 *	@return     int         			>0 if OK, <0 if KO
+	 */
+	function fetch($rowid,$ref='')
+	{
+		global $conf;
+
+		$sql = "SELECT p.rowid, p.ref, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
+		$sql.= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
+		$sql.= ", p.datec";
+		$sql.= ", p.date_valid as datev";
+		$sql.= ", p.date_livraison as date_livraison";
+		$sql.= ", p.model_pdf, p.extraparams";
+		$sql.= ", p.note_private, p.note_public";
+		$sql.= ", p.fk_projet, p.fk_statut";
+		$sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
+		$sql.= ", p.fk_cond_reglement";
+		$sql.= ", p.fk_mode_reglement";
+		$sql.= ', p.fk_account';
+		$sql.= ", p.fk_shipping_method";
+		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
+		$sql.= ", c.label as statut_label";
+		$sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
+		$sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN (' . getEntity('c_paiement').')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term').')';
+		$sql.= " WHERE p.fk_statut = c.id";
+		$sql.= " AND p.entity = ".$conf->entity;
+		if ($ref) $sql.= " AND p.ref='".$ref."'";
+		else $sql.= " AND p.rowid=".$rowid;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id                   = $obj->rowid;
+
+				$this->ref                  = $obj->ref;
+				$this->remise               = $obj->remise;
+				$this->remise_percent       = $obj->remise_percent;
+				$this->remise_absolue       = $obj->remise_absolue;
+				$this->total                = $obj->total; // TODO deprecated
+				$this->total_ht             = $obj->total_ht;
+				$this->total_tva            = $obj->tva;
+				$this->total_localtax1		= $obj->localtax1;
+				$this->total_localtax2		= $obj->localtax2;
+				$this->total_ttc            = $obj->total;
+				$this->socid                = $obj->fk_soc;
+				$this->fk_project           = $obj->fk_projet;
+				$this->modelpdf             = $obj->model_pdf;
+				$this->note                 = $obj->note_private; // TODO deprecated
+				$this->note_private         = $obj->note_private;
+				$this->note_public          = $obj->note_public;
+				$this->statut               = (int) $obj->fk_statut;
+				$this->statut_libelle       = $obj->statut_label;
+				$this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
+				$this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
+				$this->date_creation		= $this->db->jdate($obj->datec); //Creation date
+				$this->date_validation		= $this->db->jdate($obj->datev); //Validation date
+				$this->date_livraison       = $this->db->jdate($obj->date_livraison);
+				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+
+				$this->mode_reglement_id    = $obj->fk_mode_reglement;
+				$this->mode_reglement_code  = $obj->mode_reglement_code;
+				$this->mode_reglement       = $obj->mode_reglement;
+				$this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
+				$this->cond_reglement_id    = $obj->fk_cond_reglement;
+				$this->cond_reglement_code  = $obj->cond_reglement_code;
+				$this->cond_reglement       = $obj->cond_reglement;
+				$this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
+
+				$this->extraparams			= (array) json_decode($obj->extraparams, true);
+
+				$this->user_author_id = $obj->fk_user_author;
+				$this->user_valid_id  = $obj->fk_user_valid;
+				$this->user_close_id  = $obj->fk_user_cloture;
+
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+
+				if ($obj->fk_statut == 0)
+				{
+					$this->brouillon = 1;
+				}
+
+				// Retreive all extrafield for invoice
+				// fetch optionals attributes and labels
+				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+				$extrafields=new ExtraFields($this->db);
+				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+				$this->fetch_optionals($this->id,$extralabels);
+
+				$this->db->free($resql);
+
+				$this->lines = array();
+
+				/*
+                 * Lignes askprice liees a un produit ou non
+                 */
+				$sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
+				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
+				$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+				$sql.= ' d.ref_fourn as ref_produit_fourn,';
+				$sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
+				$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
+				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
+				$sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
+				$sql.= " ORDER by d.rang";
+
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
+					$i = 0;
+
+					while ($i < $num)
+					{
+						$objp                   = $this->db->fetch_object($result);
+
+						$line                   = new SupplierProposalLine($this->db);
+
+						$line->rowid			= $objp->rowid; // deprecated
+						$line->id				= $objp->rowid;
+						$line->fk_supplier_proposal		= $objp->fk_supplier_proposal;
+						$line->fk_parent_line	= $objp->fk_parent_line;
+						$line->product_type     = $objp->product_type;
+						$line->label            = $objp->custom_label;
+						$line->desc             = $objp->description;  // Description ligne
+						$line->qty              = $objp->qty;
+						$line->tva_tx           = $objp->tva_tx;
+						$line->localtax1_tx		= $objp->localtax1_tx;
+						$line->localtax2_tx		= $objp->localtax2_tx;
+						$line->subprice         = $objp->subprice;
+						$line->fk_remise_except = $objp->fk_remise_except;
+						$line->remise_percent   = $objp->remise_percent;
+						$line->price            = $objp->price;		// TODO deprecated
+
+						$line->info_bits        = $objp->info_bits;
+						$line->total_ht         = $objp->total_ht;
+						$line->total_tva        = $objp->total_tva;
+						$line->total_localtax1	= $objp->total_localtax1;
+						$line->total_localtax2	= $objp->total_localtax2;
+						$line->total_ttc        = $objp->total_ttc;
+	  					$line->fk_fournprice 	= $objp->fk_fournprice;
+						$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+						$line->pa_ht 			= $marginInfos[0];
+						$line->marge_tx			= $marginInfos[1];
+						$line->marque_tx		= $marginInfos[2];
+						$line->special_code     = $objp->special_code;
+						$line->rang             = $objp->rang;
+
+						$line->fk_product       = $objp->fk_product;
+
+						$line->ref				= $objp->product_ref;		// TODO deprecated
+						$line->product_ref		= $objp->product_ref;
+						$line->libelle			= $objp->product_label;		// TODO deprecated
+						$line->product_label	= $objp->product_label;
+						$line->product_desc     = $objp->product_desc; 		// Description produit
+						$line->fk_product_type  = $objp->fk_product_type;
+
+						$line->ref_fourn		= $objp->ref_produit_fourn;
+
+						// Multicurrency
+						$line->fk_multicurrency 		= $objp->fk_multicurrency;
 						$line->multicurrency_code 		= $objp->multicurrency_code;
 						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
 						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
@@ -1272,118 +1272,118 @@ 
 						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 						$line->fk_unit					= $objp->fk_unit;
 
-                        $this->lines[$i]        = $line;
-
-                        $i++;
-                    }
-                    $this->db->free($result);
-                }
-                else
-                {
-                    $this->error=$this->db->error();
-                    return -1;
-                }
-
-                // Retreive all extrafield for askprice
-                // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
-
-                return 1;
-            }
-
-            $this->error="Record Not Found";
-            return 0;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *	Update value of extrafields on the proposal
-     *
-     *	@param      User	$user       Object user that modify
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function update_extrafields($user)
-    {
-    	$action='update';
-
-    	// Actions on extra fields (by external module or standard code)
-    	$hookmanager->initHooks(array('supplier_proposaldao'));
-    	$parameters=array('id'=>$this->id);
-    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-    	if (empty($reshook))
-    	{
-    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-    		{
-    			$result=$this->insertExtraFields();
-    			if ($result < 0)
-    			{
-    				$error++;
-    			}
-    		}
-    	}
-    	else if ($reshook < 0) $error++;
+						$this->lines[$i]        = $line;
+
+						$i++;
+					}
+					$this->db->free($result);
+				}
+				else
+				{
+					$this->error=$this->db->error();
+					return -1;
+				}
+
+				// Retreive all extrafield for askprice
+				// fetch optionals attributes and labels
+				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+				$extrafields=new ExtraFields($this->db);
+				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+				$this->fetch_optionals($this->id,$extralabels);
+
+				return 1;
+			}
+
+			$this->error="Record Not Found";
+			return 0;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update value of extrafields on the proposal
+	 *
+	 *	@param      User	$user       Object user that modify
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	function update_extrafields($user)
+	{
+		$action='update';
+
+		// Actions on extra fields (by external module or standard code)
+		$hookmanager->initHooks(array('supplier_proposaldao'));
+		$parameters=array('id'=>$this->id);
+		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		if (empty($reshook))
+		{
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+		else if ($reshook < 0) $error++;
 
 		if (!$error)
-	    {
-	    	return 1;
-	    }
-	    else
-	    {
-	    	return -1;
-	    }
-
-    }
-
-    /**
-     *  Set status to validated
-     *
-     *  @param	User	$user       Object user that validate
-     *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *  @return int         		<0 if KO, >=0 if OK
-     */
-    function valid($user, $notrigger=0)
-    {
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    	global $conf,$langs;
-
-        $error=0;
-        $now=dol_now();
-
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate_advance)))
-        {
-            $this->db->begin();
-
-            // Numbering module definition
-            $soc = new Societe($this->db);
-            $soc->fetch($this->socid);
-
-            // Define new ref
-            if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-            {
-            	$num = $this->getNextNumRef($soc);
-            }
-            else
-            {
-            	$num = $this->ref;
-            }
-            $this->newref = $num;
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-            $sql.= " SET ref = '".$num."',";
-            $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-            dol_syslog(get_class($this)."::valid", LOG_DEBUG);
+		{
+			return 1;
+		}
+		else
+		{
+			return -1;
+		}
+
+	}
+
+	/**
+	 *  Set status to validated
+	 *
+	 *  @param	User	$user       Object user that validate
+	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @return int         		<0 if KO, >=0 if OK
+	 */
+	function valid($user, $notrigger=0)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		global $conf,$langs;
+
+		$error=0;
+		$now=dol_now();
+
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate_advance)))
+		{
+			$this->db->begin();
+
+			// Numbering module definition
+			$soc = new Societe($this->db);
+			$soc->fetch($this->socid);
+
+			// Define new ref
+			if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+			{
+				$num = $this->getNextNumRef($soc);
+			}
+			else
+			{
+				$num = $this->ref;
+			}
+			$this->newref = $num;
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+			$sql.= " SET ref = '".$num."',";
+			$sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -1394,1107 +1394,1107 @@ 
    			// Trigger calls
 			if (! $error && ! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->oldref = $this->ref;
-
-            	// Rename directory if dir was a temporary ref
-            	if (preg_match('/^[\(]?PROV/i', $this->ref))
-            	{
-            		// Rename of propal directory ($this->ref = old ref, $num = new ref)
-            		// to  not lose the linked files
-            		$oldref = dol_sanitizeFileName($this->ref);
-            		$newref = dol_sanitizeFileName($num);
-            		$dirsource = $conf->supplier_proposal->dir_output.'/'.$oldref;
-            		$dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
-
-            		if (file_exists($dirsource))
-            		{
-            			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
-            			if (@rename($dirsource, $dirdest))
-            			{
-            				dol_syslog("Rename ok");
-            				// Rename docs starting with $oldref with $newref
-            				$listoffiles=dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-            				foreach($listoffiles as $fileentry)
-            				{
-            					$dirsource=$fileentry['name'];
-            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-            					$dirsource=$fileentry['path'].'/'.$dirsource;
-            					$dirdest=$fileentry['path'].'/'.$dirdest;
-            					@rename($dirsource, $dirdest);
-            				}
-            			}
-            		}
-            	}
-
-            	$this->ref=$num;
-            	$this->brouillon=0;
-            	$this->statut = 1;
-            	$this->user_valid_id=$user->id;
-            	$this->datev=$now;
-
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-			{
-            	$this->db->rollback();
-            	return -1;
-            }
-        }
-    }
-
-    /**
-     *	Set delivery date
-     *
-     *	@param      User 		$user        		Object user that modify
-     *	@param      int			$date_livraison     Delivery date
-     *	@return     int         					<0 if ko, >0 if ok
-     */
-    function set_date_livraison($user, $date_livraison)
-    {
-        if (! empty($user->rights->supplier_proposal->creer))
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id;
-
-            if ($this->db->query($sql))
-            {
-                $this->date_livraison = $date_livraison;
-                return 1;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
-                return -1;
-            }
-        }
-    }
-
-    /**
-     *	Set an overall discount on the proposal
-     *
-     *	@param      User	$user       Object user that modify
-     *	@param      double	$remise      Amount discount
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function set_remise_percent($user, $remise)
-    {
-        $remise=trim($remise)?trim($remise):0;
-
-        if (! empty($user->rights->supplier_proposal->creer))
-        {
-            $remise = price2num($remise);
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-            if ($this->db->query($sql) )
-            {
-                $this->remise_percent = $remise;
-                $this->update_price(1);
-                return 1;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                return -1;
-            }
-        }
-    }
-
-
-    /**
-     *	Set an absolute overall discount on the proposal
-     *
-     *	@param      User	$user        Object user that modify
-     *	@param      double	$remise      Amount discount
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function set_remise_absolue($user, $remise)
-    {
-        $remise=trim($remise)?trim($remise):0;
-
-        if (! empty($user->rights->supplier_proposal->creer))
-        {
-            $remise = price2num($remise);
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql.= " SET remise_absolue = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-            if ($this->db->query($sql) )
-            {
-                $this->remise_absolue = $remise;
-                $this->update_price(1);
-                return 1;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                return -1;
-            }
-        }
-    }
-
-
-
-    /**
-     *	Reopen the commercial proposal
-     *
-     *	@param      User	$user		Object user that close
-     *	@param      int		$statut		Statut
-     *	@param      string	$note		Comment
-     *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return     int         		<0 if KO, >0 if OK
-     */
-    function reopen($user, $statut, $note='', $notrigger=0)
-    {
-        global $langs,$conf;
-
-        $this->statut = $statut;
-        $error=0;
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".$this->statut.",";
+				// Call trigger
+				$result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->oldref = $this->ref;
+
+				// Rename directory if dir was a temporary ref
+				if (preg_match('/^[\(]?PROV/i', $this->ref))
+				{
+					// Rename of propal directory ($this->ref = old ref, $num = new ref)
+					// to  not lose the linked files
+					$oldref = dol_sanitizeFileName($this->ref);
+					$newref = dol_sanitizeFileName($num);
+					$dirsource = $conf->supplier_proposal->dir_output.'/'.$oldref;
+					$dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
+
+					if (file_exists($dirsource))
+					{
+						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+						if (@rename($dirsource, $dirdest))
+						{
+							dol_syslog("Rename ok");
+							// Rename docs starting with $oldref with $newref
+							$listoffiles=dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+							foreach($listoffiles as $fileentry)
+							{
+								$dirsource=$fileentry['name'];
+								$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+								$dirsource=$fileentry['path'].'/'.$dirsource;
+								$dirdest=$fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
+						}
+					}
+				}
+
+				$this->ref=$num;
+				$this->brouillon=0;
+				$this->statut = 1;
+				$this->user_valid_id=$user->id;
+				$this->datev=$now;
+
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
+
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 		$user        		Object user that modify
+	 *	@param      int			$date_livraison     Delivery date
+	 *	@return     int         					<0 if ko, >0 if ok
+	 */
+	function set_date_livraison($user, $date_livraison)
+	{
+		if (! empty($user->rights->supplier_proposal->creer))
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
+			$sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
+			$sql.= " WHERE rowid = ".$this->id;
+
+			if ($this->db->query($sql))
+			{
+				$this->date_livraison = $date_livraison;
+				return 1;
+			}
+			else
+			{
+				$this->error=$this->db->error();
+				dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
+				return -1;
+			}
+		}
+	}
+
+	/**
+	 *	Set an overall discount on the proposal
+	 *
+	 *	@param      User	$user       Object user that modify
+	 *	@param      double	$remise      Amount discount
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	function set_remise_percent($user, $remise)
+	{
+		$remise=trim($remise)?trim($remise):0;
+
+		if (! empty($user->rights->supplier_proposal->creer))
+		{
+			$remise = price2num($remise);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			if ($this->db->query($sql) )
+			{
+				$this->remise_percent = $remise;
+				$this->update_price(1);
+				return 1;
+			}
+			else
+			{
+				$this->error=$this->db->error();
+				return -1;
+			}
+		}
+	}
+
+
+	/**
+	 *	Set an absolute overall discount on the proposal
+	 *
+	 *	@param      User	$user        Object user that modify
+	 *	@param      double	$remise      Amount discount
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	function set_remise_absolue($user, $remise)
+	{
+		$remise=trim($remise)?trim($remise):0;
+
+		if (! empty($user->rights->supplier_proposal->creer))
+		{
+			$remise = price2num($remise);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
+			$sql.= " SET remise_absolue = ".$remise;
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			if ($this->db->query($sql) )
+			{
+				$this->remise_absolue = $remise;
+				$this->update_price(1);
+				return 1;
+			}
+			else
+			{
+				$this->error=$this->db->error();
+				return -1;
+			}
+		}
+	}
+
+
+
+	/**
+	 *	Reopen the commercial proposal
+	 *
+	 *	@param      User	$user		Object user that close
+	 *	@param      int		$statut		Statut
+	 *	@param      string	$note		Comment
+	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         		<0 if KO, >0 if OK
+	 */
+	function reopen($user, $statut, $note='', $notrigger=0)
+	{
+		global $langs,$conf;
+
+		$this->statut = $statut;
+		$error=0;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+		$sql.= " SET fk_statut = ".$this->statut.",";
 		if (! empty($note)) $sql.= " note_private = '".$this->db->escape($note)."',";
-        $sql.= " date_cloture=NULL, fk_user_cloture=NULL";
-        $sql.= " WHERE rowid = ".$this->id;
+		$sql.= " date_cloture=NULL, fk_user_cloture=NULL";
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++; $this->errors[]="Error ".$this->db->lasterror();
+		}
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			if (!empty($this->errors))
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *	Close the askprice
+	 *
+	 *	@param      User	$user		Object user that close
+	 *	@param      int		$statut		Statut
+	 *	@param      string	$note		Comment
+	 *	@return     int         		<0 if KO, >0 if OK
+	 */
+	function cloture($user, $statut, $note)
+	{
+		global $langs,$conf;
+
+		$this->statut = $statut;
+		$error=0;
+		$now=dol_now();
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+		$sql.= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
+			$trigger_name='SUPPLIER_PROPOSAL_CLOSE_REFUSED';
+
+			if ($statut == 2)
+			{
+				$trigger_name='SUPPLIER_PROPOSAL_CLOSE_SIGNED';
+				$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+
+				if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
+				{
+					$result = $this->updateOrCreatePriceFournisseur($user);
+				}
+
+			}
+			if ($statut == 4)
+			{
+				$trigger_name='SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
+			}
+
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+			 	// Define output language
+			  	$outputlangs = $langs;
+			   	if (! empty($conf->global->MAIN_MULTILANGS))
+			   	{
+			   		$outputlangs = new Translate("",$conf);
+			   		$newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang);
+			   		$outputlangs->setDefaultLang($newlang);
+			   	}
+			   	//$ret=$object->fetch($id);    // Reload to get new records
+				   $this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+
+			// Call trigger
+			$result=$this->call_trigger($trigger_name,$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+
+			if ( ! $error )
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->errors[]=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Add or update supplier price according to result of proposal
+	 *
+	 *	@param     User	    $user       Object user
+	 *  @return    int                  > 0 if OK
+	 */
+	function updateOrCreatePriceFournisseur($user)
+	{
+		$productsupplier = new ProductFournisseur($this->db);
+
+		dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
+		foreach ($this->lines as $product)
+		{
+			if ($product->subprice <= 0) continue;
+
+			$idProductFourn = $productsupplier->find_min_price_product_fournisseur($product->fk_product, $product->qty);
+			$res = $productsupplier->fetch($idProductFourn);
+
+			if ($productsupplier->id) {
+				if ($productsupplier->fourn_qty == $product->qty) {
+					$this->updatePriceFournisseur($productsupplier->product_fourn_price_id, $product, $user);
+				} else {
+					$this->createPriceFournisseur($product, $user);
+				}
+			} else {
+				$this->createPriceFournisseur($product, $user);
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 *	Upate ProductFournisseur
+	 *
+	 * 	@param		int 	$idProductFournPrice	id of llx_product_fournisseur_price
+	 * 	@param		int 	$product				contain informations to update
+	 *	@param      User	$user					Object user
+	 *	@return     int         					<0 if KO, >0 if OK
+	 */
+	 function updatePriceFournisseur($idProductFournPrice, $product, $user) {
+		$price=price2num($product->subprice*$product->qty,'MU');
+		$unitPrice = price2num($product->subprice,'MU');
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_fournisseur_price SET '.(!empty($product->ref_fourn) ? 'ref_fourn = "'.$product->ref_fourn.'", ' : '').' price ='.$price.', unitprice ='.$unitPrice.' WHERE rowid = '.$idProductFournPrice;
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	 }
+
+	 /**
+	  *	Create ProductFournisseur
+	  *
+	  *	@param		Product 	$product	Object Product
+	  *	@param      User		$user		Object user
+	  *	@return     int         			<0 if KO, >0 if OK
+	  */
+	 function createPriceFournisseur($product, $user) {
+	 	$price=price2num($product->subprice*$product->qty,'MU');
+		$qty=price2num($product->qty);
+		$unitPrice = price2num($product->subprice,'MU');
+		$now=dol_now();
+
+		$values = array(
+			"'".$this->db->idate($now)."'",
+			$product->fk_product,
+			$this->thirdparty->id,
+			"'".$product->ref_fourn."'",
+			$price,
+			$qty,
+			$unitPrice,
+			$product->tva_tx,
+			$user->id
+		);
+
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
+		$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user) VALUES ('.implode(',', $values).')';
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	 }
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param		User	$user		Object user that modify
+	 *	@return		int					<0 if KO, >0 if OK
+	 */
+	function set_draft($user)
+	{
+		global $conf,$langs;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET fk_statut = 0";
+		$sql.= " WHERE rowid = ".$this->id;
+
+		if ($this->db->query($sql))
+		{
+			$this->statut = 0;
+			$this->brouillon = 1;
+			return 1;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+
+	/**
+	 *    Return list of askprice (eventually filtered on user) into an array
+	 *
+	 *    @param	int		$shortlist			0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
+	 *    @param	int		$draft				0=not draft, 1=draft
+	 *    @param	int		$notcurrentuser		0=all user, 1=not current user
+	 *    @param    int		$socid				Id third pary
+	 *    @param    int		$limit				For pagination
+	 *    @param    int		$offset				For pagination
+	 *    @param    string	$sortfield			Sort criteria
+	 *    @param    string	$sortorder			Sort order
+	 *    @return	int		       				-1 if KO, array with result if OK
+	 */
+	function liste_array($shortlist=0, $draft=0, $notcurrentuser=0, $socid=0, $limit=0, $offset=0, $sortfield='p.datec', $sortorder='DESC')
+	{
+		global $conf,$user;
+
+		$ga = array();
+
+		$sql = "SELECT s.rowid, s.nom as name, s.client,";
+		$sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
+		$sql.= " p.datep as dp, p.fin_validite as datelimite";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE p.entity = ".$conf->entity;
+		$sql.= " AND p.fk_soc = s.rowid";
+		$sql.= " AND p.fk_statut = c.id";
+		if (! $user->rights->societe->client->voir && ! $socid) //restriction
+		{
+			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		}
+		if ($socid) $sql.= " AND s.rowid = ".$socid;
+		if ($draft)	$sql.= " AND p.fk_statut = 0";
+		if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
+		$sql.= $this->db->order($sortfield,$sortorder);
+		$sql.= $this->db->plimit($limit,$offset);
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			if ($num)
+			{
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+
+					if ($shortlist == 1)
+					{
+						$ga[$obj->supplier_proposalid] = $obj->ref;
+					}
+					else if ($shortlist == 2)
+					{
+						$ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
+					}
+					else
+					{
+						$ga[$i]['id']	= $obj->supplier_proposalid;
+						$ga[$i]['ref'] 	= $obj->ref;
+						$ga[$i]['name'] = $obj->name;
+					}
+
+					$i++;
+				}
+			}
+			return $ga;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *	Delete askprice
+	 *
+	 *	@param	User	$user        	Object user that delete
+	 *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return	int						1 if ok, otherwise if error
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf,$langs;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
+			if ($this->db->query($sql))
+			{
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id;
+				if ($this->db->query($sql))
+				{
+					// Delete linked object
+					$res = $this->deleteObjectLinked();
+					if ($res < 0) $error++;
+
+					if (! $error)
+					{
+						// We remove directory
+						$ref = dol_sanitizeFileName($this->ref);
+						if ($conf->supplier_proposal->dir_output && !empty($this->ref))
+						{
+							$dir = $conf->supplier_proposal->dir_output . "/" . $ref ;
+							$file = $dir . "/" . $ref . ".pdf";
+							if (file_exists($file))
+							{
+								dol_delete_preview($this);
+
+								if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+								{
+									$this->error='ErrorFailToDeleteFile';
+									$this->errors=array('ErrorFailToDeleteFile');
+									$this->db->rollback();
+									return 0;
+								}
+							}
+							if (file_exists($dir))
+							{
+								$res=@dol_delete_dir_recursive($dir);
+								if (! $res)
+								{
+									$this->error='ErrorFailToDeleteDir';
+									$this->errors=array('ErrorFailToDeleteDir');
+									$this->db->rollback();
+									return 0;
+								}
+							}
+						}
+					}
+
+					// Removed extrafields
+					if (! $error)
+					{
+						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+						{
+							$result=$this->deleteExtraFields();
+							if ($result < 0)
+							{
+								$error++;
+								$errorflag=-4;
+								dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
+							}
+						}
+					}
+
+					if (! $error)
+					{
+						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
+						$this->db->commit();
+						return 1;
+					}
+					else
+					{
+						$this->error=$this->db->lasterror();
+						$this->db->rollback();
+						return 0;
+					}
+				}
+				else
+				{
+					$this->error=$this->db->lasterror();
+					$this->db->rollback();
+					return -3;
+				}
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Object SupplierProposal Information
+	 *
+	 * 	@param	int		$id		Proposal id
+	 *  @return	void
+	 */
+	function info($id)
+	{
+		$sql = "SELECT c.rowid, ";
+		$sql.= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
+		$sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
+		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
+		$sql.= " WHERE c.rowid = ".$id;
+
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$this->id                = $obj->rowid;
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_cloture      = $this->db->jdate($obj->dateo);
+
+				$cuser = new User($this->db);
+				$cuser->fetch($obj->fk_user_author);
+				$this->user_creation     = $cuser;
+
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation     = $vuser;
+				}
+
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture     = $cluser;
+				}
+
+
+			}
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+
+	/**
+	 *    	Return label of status of proposal (draft, validated, ...)
+	 *
+	 *    	@param      int			$mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *    	@return     string		Label
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut,$mode);
+	}
+
+	/**
+	 *    	Return label of a status (draft, validated, ...)
+	 *
+	 *    	@param      int			$statut		id statut
+	 *    	@param      int			$mode      	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *    	@return     string		Label
+	 */
+	function LibStatut($statut,$mode=1)
+	{
+		global $langs;
+		$langs->load("supplier_proposal");
+
+		if ($statut==0) $statuttrans='statut0';
+		if ($statut==1) $statuttrans='statut1';
+		if ($statut==2) $statuttrans='statut3';
+		if ($statut==3) $statuttrans='statut5';
+		if ($statut==4) $statuttrans='statut6';
+
+		if ($mode == 0)	return $this->labelstatut[$statut];
+		if ($mode == 1)	return $this->labelstatut_short[$statut];
+		if ($mode == 2)	return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
+		if ($mode == 3)	return img_picto($this->labelstatut[$statut], $statuttrans);
+		if ($mode == 4)	return img_picto($this->labelstatut[$statut],$statuttrans).' '.$this->labelstatut[$statut];
+		if ($mode == 5)	return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
+		if ($mode == 6)	return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
+	}
+
+
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param          User	$user   Object user
+	 *      @param          int		$mode   "opened" for askprice to close, "signed" for proposal to invoice
+	 *      @return         int     		<0 if KO, >0 if OK
+	 */
+	function load_board($user,$mode)
+	{
+		global $conf, $user, $langs;
+
+		$now=dol_now();
+
+		$this->nbtodo=$this->nbtodolate=0;
+		$clause = " WHERE";
+
+		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
+		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = " AND";
+		}
+		$sql.= $clause." p.entity = ".$conf->entity;
+		if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
+		if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
+		if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($mode == 'opened') {
+				$delay_warning=$conf->supplier_proposal->cloture->warning_delay;
+				$statut = self::STATUS_VALIDATED;
+				$label = $langs->trans("SupplierProposalsToClose");
+			}
+			if ($mode == 'signed') {
+				$delay_warning=$conf->supplier_proposal->facturation->warning_delay;
+				$statut = self::STATUS_SIGNED;
+				$label = $langs->trans("SupplierProposalsToProcess");      // May be billed or ordered
+			}
+
+			$response = new WorkboardResponse();
+			$response->warning_delay = $delay_warning/60/60/24;
+			$response->label = $label;
+			$response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
+			$response->img = img_object('',"propal");
+
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+				if ($mode == 'opened')
+				{
+					$datelimit = $this->db->jdate($obj->datefin);
+					if ($datelimit < ($now - $delay_warning))
+					{
+						$response->nbtodolate++;
+					}
+				}
+				// TODO Definir regle des propales a facturer en retard
+				// if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
+			}
+			return $response;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		global $user,$langs,$conf;
+
+		// Load array of products prodids
+		$num_prods = 0;
+		$prodids = array();
+		$sql = "SELECT rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_prods = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_prods)
+			{
+				$i++;
+				$row = $this->db->fetch_row($resql);
+				$prodids[$i] = $row[0];
+			}
+		}
+
+		// Initialise parametres
+		$this->id=0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen=1;
+		$this->socid = 1;
+		$this->date = time();
+		$this->cond_reglement_id   = 1;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_id   = 7;
+		$this->mode_reglement_code = 'CHQ';
+		$this->note_public='This is a comment (public)';
+		$this->note_private='This is a comment (private)';
+		// Lines
+		$nbp = 5;
+		$xnbp = 0;
+		while ($xnbp < $nbp)
+		{
+			$line=new SupplierProposalLine($this->db);
+			$line->desc=$langs->trans("Description")." ".$xnbp;
+			$line->qty=1;
+			$line->subprice=100;
+			$line->price=100;
+			$line->tva_tx=19.6;
+			$line->localtax1_tx=0;
+			$line->localtax2_tx=0;
+			if ($xnbp == 2)
+			{
+				$line->total_ht=50;
+				$line->total_ttc=59.8;
+				$line->total_tva=9.8;
+				$line->remise_percent=50;
+			}
+			else
+			{
+				$line->total_ht=100;
+				$line->total_ttc=119.6;
+				$line->total_tva=19.6;
+				$line->remise_percent=00;
+			}
+
+			if ($num_prods > 0)
+			{
+				$prodid = mt_rand(1, $num_prods);
+				$line->fk_product=$prodids[$prodid];
+			}
+
+			$this->lines[$xnbp]=$line;
+
+			$this->total_ht       += $line->total_ht;
+			$this->total_tva      += $line->total_tva;
+			$this->total_ttc      += $line->total_ttc;
+
+			$xnbp++;
+		}
+	}
+
+	/**
+	 *      Charge indicateurs this->nb de tableau de bord
+	 *
+	 *      @return     int         <0 if ko, >0 if ok
+	 */
+	function load_state_board()
+	{
+		global $conf, $user;
 
-    	$this->db->begin();
+		$this->nb=array();
+		$clause = "WHERE";
 
-		dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error++; $this->errors[]="Error ".$this->db->lasterror();
-		}
-		if (! $error)
+		$sql = "SELECT count(p.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			if (! $notrigger)
-			{
-                // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-			}
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
 		}
+		$sql.= " ".$clause." p.entity = ".$conf->entity;
 
-		// Commit or rollback
-		if ($error)
+		$resql=$this->db->query($sql);
+		if ($resql)
 		{
-		    if (!empty($this->errors))
-		    {
-    			foreach($this->errors as $errmsg)
-    			{
-    				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-    				$this->error.=($this->error?', '.$errmsg:$errmsg);
-    			}
-		    }
-			$this->db->rollback();
-			return -1*$error;
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["askprice"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
 		}
 		else
 		{
-			$this->db->commit();
-			return 1;
+			dol_print_error($this->db);
+			$this->error=$this->db->lasterror();
+			return -1;
 		}
-    }
-
-
-    /**
-     *	Close the askprice
-     *
-     *	@param      User	$user		Object user that close
-     *	@param      int		$statut		Statut
-     *	@param      string	$note		Comment
-     *	@return     int         		<0 if KO, >0 if OK
-     */
-    function cloture($user, $statut, $note)
-    {
-        global $langs,$conf;
+	}
 
-        $this->statut = $statut;
-        $error=0;
-        $now=dol_now();
 
-        $this->db->begin();
+	/**
+	 *  Returns the reference to the following non used Proposal used depending on the active numbering module
+	 *  defined into SUPPLIER_PROPOSAL_ADDON
+	 *
+	 *  @param	Societe		$soc  	Object thirdparty
+	 *  @return string      		Reference libre pour la propale
+	 */
+	function getNextNumRef($soc)
+	{
+		global $conf, $db, $langs;
+		$langs->load("supplier_proposal");
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
-        $sql.= " WHERE rowid = ".$this->id;
+		if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
+		{
+			$mybool=false;
 
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-        	$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
-        	$trigger_name='SUPPLIER_PROPOSAL_CLOSE_REFUSED';
+			$file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
+			$classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
 
-            if ($statut == 2)
-            {
-            	$trigger_name='SUPPLIER_PROPOSAL_CLOSE_SIGNED';
-				$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
 
-                if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
-                {
-                    $result = $this->updateOrCreatePriceFournisseur($user);
-                }
-
-            }
-            if ($statut == 4)
-            {
-            	$trigger_name='SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
-            }
-
-            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-            {
-             	// Define output language
-              	$outputlangs = $langs;
-               	if (! empty($conf->global->MAIN_MULTILANGS))
-               	{
-               		$outputlangs = new Translate("",$conf);
-               		$newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang);
-               		$outputlangs->setDefaultLang($newlang);
-               	}
-               	//$ret=$object->fetch($id);    // Reload to get new records
-	               $this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            }
-
-            // Call trigger
-            $result=$this->call_trigger($trigger_name,$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-
-            if ( ! $error )
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+				$dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
 
-	/**
-     *	Add or update supplier price according to result of proposal
-     *
-	 *	@param     User	    $user       Object user
-	 *  @return    int                  > 0 if OK
-     */
-	function updateOrCreatePriceFournisseur($user)
-	{
-		$productsupplier = new ProductFournisseur($this->db);
+				// Load file with numbering class (if found)
+				$mybool|=@include_once $dir.$file;
+			}
 
-		dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
-		foreach ($this->lines as $product)
-		{
-			if ($product->subprice <= 0) continue;
+			if (! $mybool)
+			{
+				dol_print_error('',"Failed to include file ".$file);
+				return '';
+			}
 
-			$idProductFourn = $productsupplier->find_min_price_product_fournisseur($product->fk_product, $product->qty);
-			$res = $productsupplier->fetch($idProductFourn);
+			$obj = new $classname();
+			$numref = "";
+			$numref = $obj->getNextValue($soc,$this);
 
-			if ($productsupplier->id) {
-				if ($productsupplier->fourn_qty == $product->qty) {
-					$this->updatePriceFournisseur($productsupplier->product_fourn_price_id, $product, $user);
-				} else {
-					$this->createPriceFournisseur($product, $user);
-				}
-			} else {
-				$this->createPriceFournisseur($product, $user);
+			if ($numref != "")
+			{
+				return $numref;
+			}
+			else
+			{
+				$this->error=$obj->error;
+				return "";
 			}
 		}
-
-		return 1;
+		else
+		{
+			$langs->load("errors");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			return "";
+		}
 	}
 
 	/**
-     *	Upate ProductFournisseur
-     *
-	 * 	@param		int 	$idProductFournPrice	id of llx_product_fournisseur_price
-	 * 	@param		int 	$product				contain informations to update
-	 *	@param      User	$user					Object user
-     *	@return     int         					<0 if KO, >0 if OK
-     */
-     function updatePriceFournisseur($idProductFournPrice, $product, $user) {
-		$price=price2num($product->subprice*$product->qty,'MU');
-		$unitPrice = price2num($product->subprice,'MU');
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_fournisseur_price SET '.(!empty($product->ref_fourn) ? 'ref_fourn = "'.$product->ref_fourn.'", ' : '').' price ='.$price.', unitprice ='.$unitPrice.' WHERE rowid = '.$idProductFournPrice;
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-		}
-	 }
-
-	 /**
-     *	Create ProductFournisseur
+	 *	Return clicable link of object (with eventually picto)
 	 *
-     *	@param		Product 	$product	Object Product
-	 *	@param      User		$user		Object user
-     *	@return     int         			<0 if KO, >0 if OK
-     */
-	 function createPriceFournisseur($product, $user) {
-	 	$price=price2num($product->subprice*$product->qty,'MU');
-	    $qty=price2num($product->qty);
-		$unitPrice = price2num($product->subprice,'MU');
-		$now=dol_now();
-
-		$values = array(
-			"'".$this->db->idate($now)."'",
-			$product->fk_product,
-			$this->thirdparty->id,
-			"'".$product->ref_fourn."'",
-			$price,
-			$qty,
-			$unitPrice,
-			$product->tva_tx,
-			$user->id
-		);
+	 *	@param      int		$withpicto					Add picto into link
+	 *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
+	 *	@param      string	$get_params    				Parametres added to url
+	 *  @param	    int   	$notooltip					1=Disable tooltip
+	 *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return     string          					String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
+	{
+		global $langs, $conf, $user;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+		$url='';
+		$result='';
+
+		$label='<u>'.$langs->trans("ShowSupplierProposal").'</u>';
+		if (! empty($this->ref))
+		$label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (! empty($this->ref_fourn))
+			$label.= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
+		if (! empty($this->total_ht))
+			$label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+		if (! empty($this->total_tva))
+			$label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+		if (! empty($this->total_ttc))
+			$label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+		if ($option == '') {
+			$url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id. $get_params;
+		}
+		if ($option == 'document') {
+			$url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params;
+		}
 
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
-		$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user) VALUES ('.implode(',', $values).')';
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		}
 
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
+		$linkclose='';
+		if (empty($notooltip) && $user->rights->propal->lire)
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowSupplierProposal");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
 		}
-	 }
 
-    /**
-     *	Set draft status
-     *
-     *	@param		User	$user		Object user that modify
-     *	@return		int					<0 if KO, >0 if OK
-     */
-    function set_draft($user)
-    {
-        global $conf,$langs;
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET fk_statut = 0";
-        $sql.= " WHERE rowid = ".$this->id;
-
-        if ($this->db->query($sql))
-        {
-            $this->statut = 0;
-            $this->brouillon = 1;
-            return 1;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-
-    /**
-     *    Return list of askprice (eventually filtered on user) into an array
-     *
-     *    @param	int		$shortlist			0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
-     *    @param	int		$draft				0=not draft, 1=draft
-     *    @param	int		$notcurrentuser		0=all user, 1=not current user
-     *    @param    int		$socid				Id third pary
-     *    @param    int		$limit				For pagination
-     *    @param    int		$offset				For pagination
-     *    @param    string	$sortfield			Sort criteria
-     *    @param    string	$sortorder			Sort order
-     *    @return	int		       				-1 if KO, array with result if OK
-     */
-    function liste_array($shortlist=0, $draft=0, $notcurrentuser=0, $socid=0, $limit=0, $offset=0, $sortfield='p.datec', $sortorder='DESC')
-    {
-        global $conf,$user;
-
-        $ga = array();
-
-        $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
-        $sql.= " p.datep as dp, p.fin_validite as datelimite";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE p.entity = ".$conf->entity;
-        $sql.= " AND p.fk_soc = s.rowid";
-        $sql.= " AND p.fk_statut = c.id";
-        if (! $user->rights->societe->client->voir && ! $socid) //restriction
-        {
-        	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        }
-        if ($socid) $sql.= " AND s.rowid = ".$socid;
-        if ($draft)	$sql.= " AND p.fk_statut = 0";
-        if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
-        $sql.= $this->db->order($sortfield,$sortorder);
-        $sql.= $this->db->plimit($limit,$offset);
-
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            if ($num)
-            {
-                $i = 0;
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($result);
-
-                    if ($shortlist == 1)
-                    {
-                        $ga[$obj->supplier_proposalid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
-                    {
-                        $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
-					{
-                        $ga[$i]['id']	= $obj->supplier_proposalid;
-                        $ga[$i]['ref'] 	= $obj->ref;
-                        $ga[$i]['name'] = $obj->name;
-                    }
-
-                    $i++;
-                }
-            }
-            return $ga;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     *	Delete askprice
-     *
-     *	@param	User	$user        	Object user that delete
-     *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return	int						1 if ok, otherwise if error
-     */
-    function delete($user, $notrigger=0)
-    {
-        global $conf,$langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error=0;
-
-        $this->db->begin();
-
-        if (! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-
-        if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
-            if ($this->db->query($sql))
-            {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id;
-                if ($this->db->query($sql))
-                {
-                    // Delete linked object
-                    $res = $this->deleteObjectLinked();
-                    if ($res < 0) $error++;
-
-                    if (! $error)
-                    {
-                        // We remove directory
-                        $ref = dol_sanitizeFileName($this->ref);
-                        if ($conf->supplier_proposal->dir_output && !empty($this->ref))
-                        {
-                            $dir = $conf->supplier_proposal->dir_output . "/" . $ref ;
-                            $file = $dir . "/" . $ref . ".pdf";
-                            if (file_exists($file))
-                            {
-                                dol_delete_preview($this);
-
-                                if (! dol_delete_file($file,0,0,0,$this)) // For triggers
-                                {
-                                    $this->error='ErrorFailToDeleteFile';
-                                    $this->errors=array('ErrorFailToDeleteFile');
-                                	$this->db->rollback();
-                                    return 0;
-                                }
-                            }
-                            if (file_exists($dir))
-                            {
-                                $res=@dol_delete_dir_recursive($dir);
-                                if (! $res)
-                                {
-                                    $this->error='ErrorFailToDeleteDir';
-                                    $this->errors=array('ErrorFailToDeleteDir');
-                                    $this->db->rollback();
-                                    return 0;
-                                }
-                            }
-                        }
-                    }
-
-                    // Removed extrafields
-                    if (! $error)
-                    {
-                    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-                    	{
-                    		$result=$this->deleteExtraFields();
-                    		if ($result < 0)
-                    		{
-                    			$error++;
-                    			$errorflag=-4;
-                    			dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
-                    		}
-                    	}
-                    }
-
-                    if (! $error)
-                    {
-                        dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
-                        $this->db->commit();
-                        return 1;
-                    }
-                    else
-                    {
-                        $this->error=$this->db->lasterror();
-                        $this->db->rollback();
-                        return 0;
-                    }
-                }
-                else
-                {
-                    $this->error=$this->db->lasterror();
-                    $this->db->rollback();
-                    return -3;
-                }
-            }
-            else
-            {
-                $this->error=$this->db->lasterror();
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Object SupplierProposal Information
-     *
-     * 	@param	int		$id		Proposal id
-     *  @return	void
-     */
-    function info($id)
-    {
-        $sql = "SELECT c.rowid, ";
-        $sql.= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
-        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
-        $sql.= " WHERE c.rowid = ".$id;
-
-        $result = $this->db->query($sql);
-
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-
-                $this->id                = $obj->rowid;
-
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-                $this->date_cloture      = $this->db->jdate($obj->dateo);
-
-                $cuser = new User($this->db);
-                $cuser->fetch($obj->fk_user_author);
-                $this->user_creation     = $cuser;
-
-                if ($obj->fk_user_valid)
-                {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation     = $vuser;
-                }
-
-                if ($obj->fk_user_cloture)
-                {
-                    $cluser = new User($this->db);
-                    $cluser->fetch($obj->fk_user_cloture);
-                    $this->user_cloture     = $cluser;
-                }
-
-
-            }
-            $this->db->free($result);
-
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
-
-
-    /**
-     *    	Return label of status of proposal (draft, validated, ...)
-     *
-     *    	@param      int			$mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     *    	@return     string		Label
-     */
-    function getLibStatut($mode=0)
-    {
-        return $this->LibStatut($this->statut,$mode);
-    }
-
-    /**
-     *    	Return label of a status (draft, validated, ...)
-     *
-     *    	@param      int			$statut		id statut
-     *    	@param      int			$mode      	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     *    	@return     string		Label
-     */
-	function LibStatut($statut,$mode=1)
-    {
-		global $langs;
-		$langs->load("supplier_proposal");
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
 
-		if ($statut==0) $statuttrans='statut0';
-		if ($statut==1) $statuttrans='statut1';
-		if ($statut==2) $statuttrans='statut3';
-		if ($statut==3) $statuttrans='statut5';
-		if ($statut==4) $statuttrans='statut6';
+		$picto='supplier_proposal';
 
-		if ($mode == 0)	return $this->labelstatut[$statut];
-		if ($mode == 1)	return $this->labelstatut_short[$statut];
-		if ($mode == 2)	return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
-		if ($mode == 3)	return img_picto($this->labelstatut[$statut], $statuttrans);
-		if ($mode == 4)	return img_picto($this->labelstatut[$statut],$statuttrans).' '.$this->labelstatut[$statut];
-		if ($mode == 5)	return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
-		if ($mode == 6)	return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
-	}
 
+		if ($withpicto)
+			$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2)
+			$result.=' ';
+		$result.=$linkstart.$this->ref.$linkend;
+		return $result;
+	}
 
-    /**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param          User	$user   Object user
-     *      @param          int		$mode   "opened" for askprice to close, "signed" for proposal to invoice
-     *      @return         int     		<0 if KO, >0 if OK
-     */
-    function load_board($user,$mode)
-    {
-        global $conf, $user, $langs;
-
-        $now=dol_now();
-
-        $this->nbtodo=$this->nbtodolate=0;
-        $clause = " WHERE";
-
-        $sql = "SELECT p.rowid, p.ref, p.datec as datec";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-        {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
-            $clause = " AND";
-        }
-        $sql.= $clause." p.entity = ".$conf->entity;
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($mode == 'opened') {
-	            $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
-	            $statut = self::STATUS_VALIDATED;
-	            $label = $langs->trans("SupplierProposalsToClose");
-            }
-            if ($mode == 'signed') {
-	            $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
-	            $statut = self::STATUS_SIGNED;
-	            $label = $langs->trans("SupplierProposalsToProcess");      // May be billed or ordered
-            }
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay = $delay_warning/60/60/24;
-	        $response->label = $label;
-	        $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
-	        $response->img = img_object('',"propal");
-
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-                if ($mode == 'opened')
-                {
-                    $datelimit = $this->db->jdate($obj->datefin);
-                    if ($datelimit < ($now - $delay_warning))
-                    {
-                        $response->nbtodolate++;
-                    }
-                }
-                // TODO Definir regle des propales a facturer en retard
-                // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
-            }
-            return $response;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-        global $user,$langs,$conf;
-
-        // Load array of products prodids
-        $num_prods = 0;
-        $prodids = array();
-        $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num_prods = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num_prods)
-            {
-                $i++;
-                $row = $this->db->fetch_row($resql);
-                $prodids[$i] = $row[0];
-            }
-        }
-
-        // Initialise parametres
-        $this->id=0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen=1;
-        $this->socid = 1;
-        $this->date = time();
-        $this->cond_reglement_id   = 1;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_id   = 7;
-        $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
-        // Lines
-        $nbp = 5;
-        $xnbp = 0;
-        while ($xnbp < $nbp)
-        {
-            $line=new SupplierProposalLine($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=19.6;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
-            if ($xnbp == 2)
-            {
-                $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
-                $line->remise_percent=50;
-            }
-            else
-            {
-                $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
-                $line->remise_percent=00;
-            }
-
-            if ($num_prods > 0)
-            {
-            	$prodid = mt_rand(1, $num_prods);
-            	$line->fk_product=$prodids[$prodid];
-            }
-
-            $this->lines[$xnbp]=$line;
-
-            $this->total_ht       += $line->total_ht;
-            $this->total_tva      += $line->total_tva;
-            $this->total_ttc      += $line->total_ttc;
-
-            $xnbp++;
-        }
-    }
-
-    /**
-     *      Charge indicateurs this->nb de tableau de bord
-     *
-     *      @return     int         <0 if ko, >0 if ok
-     */
-    function load_state_board()
-    {
-        global $conf, $user;
-
-        $this->nb=array();
-        $clause = "WHERE";
-
-        $sql = "SELECT count(p.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-        {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
-            $clause = "AND";
-        }
-        $sql.= " ".$clause." p.entity = ".$conf->entity;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $this->nb["askprice"]=$obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Returns the reference to the following non used Proposal used depending on the active numbering module
-     *  defined into SUPPLIER_PROPOSAL_ADDON
-     *
-     *  @param	Societe		$soc  	Object thirdparty
-     *  @return string      		Reference libre pour la propale
-     */
-    function getNextNumRef($soc)
-    {
-        global $conf, $db, $langs;
-        $langs->load("supplier_proposal");
-
-        if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
-        {
-        	$mybool=false;
-
-            $file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
-            $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
-
-            // Include file with class
-            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-            foreach ($dirmodels as $reldir) {
-
-                $dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
-
-                // Load file with numbering class (if found)
-                $mybool|=@include_once $dir.$file;
-            }
-
-            if (! $mybool)
-            {
-            	dol_print_error('',"Failed to include file ".$file);
-            	return '';
-            }
-
-            $obj = new $classname();
-            $numref = "";
-            $numref = $obj->getNextValue($soc,$this);
-
-            if ($numref != "")
-            {
-                return $numref;
-            }
-            else
-			{
-                $this->error=$obj->error;
-                return "";
-            }
-        }
-        else
-		{
-            $langs->load("errors");
-            print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
-            return "";
-        }
-    }
-
-    /**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int		$withpicto					Add picto into link
-     *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
-     *	@param      string	$get_params    				Parametres added to url
-     *  @param	    int   	$notooltip					1=Disable tooltip
-     *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return     string          					String with URL
-     */
-    function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
-    {
-        global $langs, $conf, $user;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-        $url='';
-        $result='';
-
-        $label='<u>'.$langs->trans("ShowSupplierProposal").'</u>';
-        if (! empty($this->ref))
-        $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (! empty($this->ref_fourn))
-            $label.= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-        if ($option == '') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id. $get_params;
-        }
-        if ($option == 'document') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params;
-        }
-
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-        }
-
-        $linkclose='';
-        if (empty($notooltip) && $user->rights->propal->lire)
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowSupplierProposal");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-        }
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        $picto='supplier_proposal';
-
-
-        if ($withpicto)
-            $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2)
-            $result.=' ';
-        $result.=$linkstart.$this->ref.$linkend;
-        return $result;
-    }
-
-    /**
-     * 	Retrieve an array of supplier proposal lines
+	/**
+	 * 	Retrieve an array of supplier proposal lines
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
-     */
-    function getLinesArray()
-    {
-        // For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
-
-        $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-        $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
-        $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
-        $sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
-        $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
-        $sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn,';
+	 */
+	function getLinesArray()
+	{
+		// For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
+
+		$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
+		$sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
+		$sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
+		$sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
+		$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
+		$sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn,';
 		$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-        $sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
-        $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
-
-        dol_syslog(get_class($this).'::getLinesArray', 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);
-
-                $this->lines[$i]					= new SupplierProposalLine($this->db);
-                $this->lines[$i]->id				= $obj->rowid; // for backward compatibility
-                $this->lines[$i]->rowid				= $obj->rowid;
-                $this->lines[$i]->label 			= $obj->custom_label;
-                $this->lines[$i]->description 		= $obj->description;
-                $this->lines[$i]->fk_product		= $obj->fk_product;
-                $this->lines[$i]->ref				= $obj->ref;
-                $this->lines[$i]->product_label		= $obj->product_label;
-                $this->lines[$i]->product_desc		= $obj->product_desc;
-                $this->lines[$i]->fk_product_type	= $obj->fk_product_type;  // deprecated
-                $this->lines[$i]->product_type		= $obj->product_type;
-                $this->lines[$i]->qty				= $obj->qty;
-                $this->lines[$i]->subprice			= $obj->subprice;
-                $this->lines[$i]->fk_remise_except 	= $obj->fk_remise_except;
-                $this->lines[$i]->remise_percent	= $obj->remise_percent;
-                $this->lines[$i]->tva_tx			= $obj->tva_tx;
-                $this->lines[$i]->info_bits			= $obj->info_bits;
-                $this->lines[$i]->total_ht			= $obj->total_ht;
-                $this->lines[$i]->total_tva			= $obj->total_tva;
-                $this->lines[$i]->total_ttc			= $obj->total_ttc;
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+		$sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
+		$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
+
+		dol_syslog(get_class($this).'::getLinesArray', 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);
+
+				$this->lines[$i]					= new SupplierProposalLine($this->db);
+				$this->lines[$i]->id				= $obj->rowid; // for backward compatibility
+				$this->lines[$i]->rowid				= $obj->rowid;
+				$this->lines[$i]->label 			= $obj->custom_label;
+				$this->lines[$i]->description 		= $obj->description;
+				$this->lines[$i]->fk_product		= $obj->fk_product;
+				$this->lines[$i]->ref				= $obj->ref;
+				$this->lines[$i]->product_label		= $obj->product_label;
+				$this->lines[$i]->product_desc		= $obj->product_desc;
+				$this->lines[$i]->fk_product_type	= $obj->fk_product_type;  // deprecated
+				$this->lines[$i]->product_type		= $obj->product_type;
+				$this->lines[$i]->qty				= $obj->qty;
+				$this->lines[$i]->subprice			= $obj->subprice;
+				$this->lines[$i]->fk_remise_except 	= $obj->fk_remise_except;
+				$this->lines[$i]->remise_percent	= $obj->remise_percent;
+				$this->lines[$i]->tva_tx			= $obj->tva_tx;
+				$this->lines[$i]->info_bits			= $obj->info_bits;
+				$this->lines[$i]->total_ht			= $obj->total_ht;
+				$this->lines[$i]->total_tva			= $obj->total_tva;
+				$this->lines[$i]->total_ttc			= $obj->total_ttc;
 				$this->lines[$i]->fk_fournprice		= $obj->fk_fournprice;
 				$marginInfos						= getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
 				$this->lines[$i]->pa_ht				= $marginInfos[0];
 				$this->lines[$i]->marge_tx			= $marginInfos[1];
 				$this->lines[$i]->marque_tx			= $marginInfos[2];
 				$this->lines[$i]->fk_parent_line	= $obj->fk_parent_line;
-                $this->lines[$i]->special_code		= $obj->special_code;
-                $this->lines[$i]->rang				= $obj->rang;
+				$this->lines[$i]->special_code		= $obj->special_code;
+				$this->lines[$i]->rang				= $obj->rang;
 
-                $this->lines[$i]->ref_fourn				= $obj->ref_produit_fourn;
+				$this->lines[$i]->ref_fourn				= $obj->ref_produit_fourn;
 
 				// Multicurrency
 				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
@@ -2505,18 +2505,18 @@ 
 				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 				$this->lines[$i]->fk_unit				 	= $obj->fk_unit;
 
-                $i++;
-            }
-            $this->db->free($resql);
+				$i++;
+			}
+			$this->db->free($resql);
 
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 
 	/**
 	 *  Create a document onto disk according to template module.
@@ -2561,11 +2561,11 @@ 
 	 */
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
-	    $tables = array(
-	        'supplier_proposal'
-	    );
+		$tables = array(
+			'supplier_proposal'
+		);
 
-	    return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
 }
@@ -2576,21 +2576,21 @@ 
  */
 class SupplierProposalLine extends CommonObjectLine
 {
-    var $db;
-    var $error;
+	var $db;
+	var $error;
 
-    public $element='supplier_proposaldet';
-    public $table_element='supplier_proposaldet';
+	public $element='supplier_proposaldet';
+	public $table_element='supplier_proposaldet';
 
-    var $oldline;
+	var $oldline;
 
-    // From llx_supplier_proposaldet
-    var $rowid; // deprecated
-    var $id;
-    var $fk_supplier_proposal;
-    var $fk_parent_line;
-    var $desc;          	// Description ligne
-    var $fk_product;		// Id produit predefini
+	// From llx_supplier_proposaldet
+	var $rowid; // deprecated
+	var $id;
+	var $fk_supplier_proposal;
+	var $fk_parent_line;
+	var $desc;          	// Description ligne
+	var $fk_product;		// Id produit predefini
 	/**
 	 * @deprecated
 	 * @see product_type
@@ -2601,46 +2601,46 @@ 
 	 * @var int
 	 * @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
 	 */
-    public $product_type = Product::TYPE_PRODUCT;
+	public $product_type = Product::TYPE_PRODUCT;
 
-    var $qty;
-    var $tva_tx;
-    var $subprice;
-    var $remise_percent;
-    var $fk_remise_except;
+	var $qty;
+	var $tva_tx;
+	var $subprice;
+	var $remise_percent;
+	var $fk_remise_except;
 
-    var $rang = 0;
+	var $rang = 0;
 
 	var $fk_fournprice;
 	var $pa_ht;
 	var $marge_tx;
 	var $marque_tx;
 
-    var $special_code;	// Tag for special lines (exlusive tags)
-    // 1: frais de port
-    // 2: ecotaxe
-    // 3: option line (when qty = 0)
+	var $special_code;	// Tag for special lines (exlusive tags)
+	// 1: frais de port
+	// 2: ecotaxe
+	// 3: option line (when qty = 0)
 
-    var $info_bits = 0;	// Liste d'options cumulables:
-    // Bit 0: 	0 si TVA normal - 1 si TVA NPR
-    // Bit 1:	0 ligne normale - 1 si ligne de remise fixe
+	var $info_bits = 0;	// Liste d'options cumulables:
+	// Bit 0: 	0 si TVA normal - 1 si TVA NPR
+	// Bit 1:	0 ligne normale - 1 si ligne de remise fixe
 
-    var $total_ht;			// Total HT  de la ligne toute quantite et incluant la remise ligne
-    var $total_tva;			// Total TVA  de la ligne toute quantite et incluant la remise ligne
-    var $total_ttc;			// Total TTC de la ligne toute quantite et incluant la remise ligne
+	var $total_ht;			// Total HT  de la ligne toute quantite et incluant la remise ligne
+	var $total_tva;			// Total TVA  de la ligne toute quantite et incluant la remise ligne
+	var $total_ttc;			// Total TTC de la ligne toute quantite et incluant la remise ligne
 
 	/**
 	 * @deprecated
 	 * @see remise_percent, fk_remise_except
 	 */
-    var $remise;
+	var $remise;
 	/**
 	 * @deprecated
 	 * @see subprice
 	 */
-    var $price;
+	var $price;
 
-    // From llx_product
+	// From llx_product
 	/**
 	 * @deprecated
 	 * @see product_ref
@@ -2667,14 +2667,14 @@ 
 	 */
 	public $product_desc;
 
-    var $localtax1_tx;		// Local tax 1
-    var $localtax2_tx;		// Local tax 2
-    var $localtax1_type;	// Local tax 1 type
+	var $localtax1_tx;		// Local tax 1
+	var $localtax2_tx;		// Local tax 2
+	var $localtax1_type;	// Local tax 1 type
 	var $localtax2_type;	// Local tax 2 type
-    var $total_localtax1;  	// Line total local tax 1
-    var $total_localtax2;	// Line total local tax 2
+	var $total_localtax1;  	// Line total local tax 1
+	var $total_localtax2;	// Line total local tax 2
 
-    var $skip_update_total; // Skip update price total for special lines
+	var $skip_update_total; // Skip update price total for special lines
 
 	var $ref_fourn;
 
@@ -2686,22 +2686,22 @@ 
 	var $multicurrency_total_tva;
 	var $multicurrency_total_ttc;
 
-    /**
-     * 	Class line Contructor
-     *
-     * 	@param	DoliDB	$db	Database handler
-     */
-    function __construct($db)
-    {
-        $this->db= $db;
-    }
-
-    /**
-     *	Retrieve the propal line object
-     *
-     *	@param	int		$rowid		Propal line id
-     *	@return	int					<0 if KO, >0 if OK
-     */
+	/**
+	 * 	Class line Contructor
+	 *
+	 * 	@param	DoliDB	$db	Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db= $db;
+	}
+
+	/**
+	 *	Retrieve the propal line object
+	 *
+	 *	@param	int		$rowid		Propal line id
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
 	function fetch($rowid)
 	{
 		$sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
@@ -2776,39 +2776,39 @@ 
 		}
 	}
 
-    /**
-     *  Insert object line propal in database
-     *
-     *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    function insert($notrigger=0)
-    {
-        global $conf,$langs,$user;
-
-        $error=0;
-
-        dol_syslog(get_class($this)."::insert rang=".$this->rang);
-
-        // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type=0;
+	/**
+	 *  Insert object line propal in database
+	 *
+	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	function insert($notrigger=0)
+	{
+		global $conf,$langs,$user;
+
+		$error=0;
+
+		dol_syslog(get_class($this)."::insert rang=".$this->rang);
+
+		// Clean parameters
+		if (empty($this->tva_tx)) $this->tva_tx=0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+		if (empty($this->localtax1_type)) $this->localtax1_type=0;
 		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
-
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+		if (empty($this->total_localtax1)) $this->total_localtax1=0;
+		if (empty($this->total_localtax2)) $this->total_localtax2=0;
+		if (empty($this->rang)) $this->rang=0;
+		if (empty($this->remise)) $this->remise=0;
+		if (empty($this->remise_percent)) $this->remise_percent=0;
+		if (empty($this->info_bits)) $this->info_bits=0;
+		if (empty($this->special_code)) $this->special_code=0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+		if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
+		if (empty($this->fk_unit)) $this->fk_unit=0;
+		if (empty($this->subprice)) $this->subprice=0;
+
+		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2823,175 +2823,175 @@ 
 			}
 		}
 
-        // Check parameters
-        if ($this->product_type < 0) return -1;
+		// Check parameters
+		if ($this->product_type < 0) return -1;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Insert line into database
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
-        $sql.= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
+		// Insert line into database
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
+		$sql.= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
 		$sql.= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' subprice, remise_percent, ';
-        $sql.= ' info_bits, ';
-        $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
-        $sql.= ' ref_fourn,';
+		$sql.= ' subprice, remise_percent, ';
+		$sql.= ' info_bits, ';
+		$sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
+		$sql.= ' ref_fourn,';
 		$sql.= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
-        $sql.= " VALUES (".$this->fk_supplier_proposal.",";
-        $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
-        $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->desc)."',";
-        $sql.= " ".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->product_type)."',";
-        $sql.= " ".($this->fk_remise_except?"'".$this->db->escape($this->fk_remise_except)."'":"null").",";
-        $sql.= " ".price2num($this->qty).",";
-        $sql.= " ".price2num($this->tva_tx).",";
-        $sql.= " ".price2num($this->localtax1_tx).",";
-        $sql.= " ".price2num($this->localtax2_tx).",";
+		$sql.= " VALUES (".$this->fk_supplier_proposal.",";
+		$sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
+		$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+		$sql.= " '".$this->db->escape($this->desc)."',";
+		$sql.= " ".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":"null").",";
+		$sql.= " '".$this->db->escape($this->product_type)."',";
+		$sql.= " ".($this->fk_remise_except?"'".$this->db->escape($this->fk_remise_except)."'":"null").",";
+		$sql.= " ".price2num($this->qty).",";
+		$sql.= " ".price2num($this->tva_tx).",";
+		$sql.= " ".price2num($this->localtax1_tx).",";
+		$sql.= " ".price2num($this->localtax2_tx).",";
 		$sql.= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= " ".(!empty($this->subprice)?price2num($this->subprice):"null").",";
-        $sql.= " ".price2num($this->remise_percent).",";
-        $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").",";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").",";
-        $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
-        $sql.= ' '.$this->special_code.',';
-        $sql.= ' '.$this->rang.',';
-        $sql.= " '".$this->db->escape($this->ref_fourn)."'";
+		$sql.= " ".(!empty($this->subprice)?price2num($this->subprice):"null").",";
+		$sql.= " ".price2num($this->remise_percent).",";
+		$sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").",";
+		$sql.= " ".price2num($this->total_ht).",";
+		$sql.= " ".price2num($this->total_tva).",";
+		$sql.= " ".price2num($this->total_localtax1).",";
+		$sql.= " ".price2num($this->total_localtax2).",";
+		$sql.= " ".price2num($this->total_ttc).",";
+		$sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").",";
+		$sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
+		$sql.= ' '.$this->special_code.',';
+		$sql.= ' '.$this->rang.',';
+		$sql.= " '".$this->db->escape($this->ref_fourn)."'";
 		$sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".$this->multicurrency_subprice;
 		$sql.= ", ".$this->multicurrency_total_ht;
 		$sql.= ", ".$this->multicurrency_total_tva;
 		$sql.= ", ".$this->multicurrency_total_ttc;
-        $sql.= ", ".($this->fk_unit?$this->fk_unit:'null');
+		$sql.= ", ".($this->fk_unit?$this->fk_unit:'null');
 		$sql.= ')';
 
-        dol_syslog(get_class($this).'::insert', LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
+		dol_syslog(get_class($this).'::insert', LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
 			$this->id=$this->rowid;
 
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            {
-            	$result=$this->insertExtraFields();
-            	if ($result < 0)
-            	{
-            		$error++;
-            	}
-            }
-
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT',$user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
-
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * 	Delete line in database
-     *
-     *	@return	 int  <0 if ko, >0 if ok
-     */
-    function delete()
-    {
-        global $conf,$langs,$user;
-
-        $error=0;
-        $this->db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->rowid;
-        dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
-        if ($this->db->query($sql) )
-        {
-
-        	// Remove extrafields
-        	if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-        	{
-        		$this->id=$this->rowid;
-        		$result=$this->deleteExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        			dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        		}
-        	}
-
-            // Call trigger
-            $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE',$user);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                return -1;
-            }
-            // End call triggers
-
-            $this->db->commit();
-
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Update propal line object into DB
-     *
-     *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return	int					<0 if ko, >0 if ok
-     */
-    function update($notrigger=0)
-    {
-        global $conf,$langs,$user;
-
-        $error=0;
-
-        // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT',$user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+			}
+
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Delete line in database
+	 *
+	 *	@return	 int  <0 if ko, >0 if ok
+	 */
+	function delete()
+	{
+		global $conf,$langs,$user;
+
+		$error=0;
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->rowid;
+		dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
+		if ($this->db->query($sql) )
+		{
+
+			// Remove extrafields
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			{
+				$this->id=$this->rowid;
+				$result=$this->deleteExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+				}
+			}
+
+			// Call trigger
+			$result=$this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE',$user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
+
+			$this->db->commit();
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update propal line object into DB
+	 *
+	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return	int					<0 if ko, >0 if ok
+	 */
+	function update($notrigger=0)
+	{
+		global $conf,$langs,$user;
+
+		$error=0;
+
+		// Clean parameters
+		if (empty($this->tva_tx)) $this->tva_tx=0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+		if (empty($this->total_localtax1)) $this->total_localtax1=0;
+		if (empty($this->total_localtax2)) $this->total_localtax2=0;
 		if (empty($this->localtax1_type)) $this->localtax1_type=0;
 		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->marque_tx)) $this->marque_tx=0;
-        if (empty($this->marge_tx)) $this->marge_tx=0;
-        if (empty($this->price)) $this->price=0;	// TODO A virer
-        if (empty($this->remise)) $this->remise=0;	// TODO A virer
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
+		if (empty($this->marque_tx)) $this->marque_tx=0;
+		if (empty($this->marge_tx)) $this->marge_tx=0;
+		if (empty($this->price)) $this->price=0;	// TODO A virer
+		if (empty($this->remise)) $this->remise=0;	// TODO A virer
+		if (empty($this->remise_percent)) $this->remise_percent=0;
+		if (empty($this->info_bits)) $this->info_bits=0;
+		if (empty($this->special_code)) $this->special_code=0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+		if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
+		if (empty($this->fk_unit)) $this->fk_unit=0;
+		if (empty($this->subprice)) $this->subprice=0;
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
@@ -3008,117 +3008,117 @@ 
 			}
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql.= " description='".$this->db->escape($this->desc)."'";
-        $sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-        $sql.= " , product_type=".$this->product_type;
-        $sql.= " , tva_tx='".price2num($this->tva_tx)."'";
-        $sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
-        $sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
+		$sql.= " description='".$this->db->escape($this->desc)."'";
+		$sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
+		$sql.= " , product_type=".$this->product_type;
+		$sql.= " , tva_tx='".price2num($this->tva_tx)."'";
+		$sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
+		$sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
 		$sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
 		$sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql.= " , qty='".price2num($this->qty)."'";
-        $sql.= " , subprice=".price2num($this->subprice)."";
-        $sql.= " , remise_percent=".price2num($this->remise_percent)."";
-        $sql.= " , price=".price2num($this->price)."";					// TODO A virer
-        $sql.= " , remise=".price2num($this->remise)."";				// TODO A virer
-        $sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
-        if (empty($this->skip_update_total))
-        {
-            $sql.= " , total_ht=".price2num($this->total_ht)."";
-            $sql.= " , total_tva=".price2num($this->total_tva)."";
-            $sql.= " , total_ttc=".price2num($this->total_ttc)."";
-            $sql.= " , total_localtax1=".price2num($this->total_localtax1)."";
-            $sql.= " , total_localtax2=".price2num($this->total_localtax2)."";
-        }
+		$sql.= " , qty='".price2num($this->qty)."'";
+		$sql.= " , subprice=".price2num($this->subprice)."";
+		$sql.= " , remise_percent=".price2num($this->remise_percent)."";
+		$sql.= " , price=".price2num($this->price)."";					// TODO A virer
+		$sql.= " , remise=".price2num($this->remise)."";				// TODO A virer
+		$sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
+		if (empty($this->skip_update_total))
+		{
+			$sql.= " , total_ht=".price2num($this->total_ht)."";
+			$sql.= " , total_tva=".price2num($this->total_tva)."";
+			$sql.= " , total_ttc=".price2num($this->total_ttc)."";
+			$sql.= " , total_localtax1=".price2num($this->total_localtax1)."";
+			$sql.= " , total_localtax2=".price2num($this->total_localtax2)."";
+		}
 		$sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null");
 		$sql.= " , buy_price_ht=".price2num($this->pa_ht);
-        if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
-        $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
-        if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
-        $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
-        $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
+		if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
+		$sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
+		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
+		$sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
+		$sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
 
 		// Multicurrency
 		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+
+		$sql.= " WHERE rowid = ".$this->rowid;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$this->id=$this->rowid;
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE',$user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+			}
+
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 
+	/**
+	 *	Update DB line fields total_xxx
+	 *	Used by migration
+	 *
+	 *	@return		int		<0 if ko, >0 if ok
+	 */
+	function update_total()
+	{
+		$this->db->begin();
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
+		$sql.= " total_ht=".price2num($this->total_ht,'MT')."";
+		$sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
+		$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
 		$sql.= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        	{
-        		$this->id=$this->rowid;
-        		$result=$this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
-
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE',$user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
-
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     *	Update DB line fields total_xxx
-     *	Used by migration
-     *
-     *	@return		int		<0 if ko, >0 if ok
-     */
-    function update_total()
-    {
-        $this->db->begin();
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql.= " total_ht=".price2num($this->total_ht,'MT')."";
-        $sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
-        $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
-        $sql.= " WHERE rowid = ".$this->rowid;
-
-        dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+		dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 
 }
 

Spacing +805 added lines, -805 removed lines

@@ -32,40 +32,40 @@ 
  *	\brief      File of class to manage supplier proposals
  */
 
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage price ask supplier
  */
 class SupplierProposal extends CommonObject
 {
-    public $element='supplier_proposal';
-    public $table_element='supplier_proposal';
-    public $table_element_line='supplier_proposaldet';
-    public $fk_element='fk_supplier_proposal';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='propal';
+    public $element = 'supplier_proposal';
+    public $table_element = 'supplier_proposal';
+    public $table_element_line = 'supplier_proposaldet';
+    public $fk_element = 'fk_supplier_proposal';
+    protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    public $picto = 'propal';
 
     /**
      * {@inheritdoc}
      */
     protected $table_ref_field = 'ref';
 
-    var $socid;		// Id client
+    var $socid; // Id client
 
 	/**
 	 * @deprecated
 	 * @see user_author_id
 	 */
     var $author;
-	var $ref_fourn;  //Reference saisie lors de l'ajout d'une ligne à la demande
-    var $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
-    var $date;						// Date of proposal
+	var $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
+    var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
+    var $date; // Date of proposal
     var $date_livraison;
 
 	/**
@@ -119,14 +119,14 @@ 
     var $remise_percent;
     var $remise_absolue;
 
-    var $products=array();
-    var $extraparams=array();
+    var $products = array();
+    var $extraparams = array();
 
     var $lines = array();
     var $line;
 
-    var $labelstatut=array();
-    var $labelstatut_short=array();
+    var $labelstatut = array();
+    var $labelstatut_short = array();
 
     var $nbtodo;
     var $nbtodolate;
@@ -171,9 +171,9 @@ 
      *	@param      int		$socid		Id third party
      *	@param      int		$supplier_proposalid   Id supplier_proposal
      */
-    function __construct($db, $socid="", $supplier_proposalid=0)
+    function __construct($db, $socid = "", $supplier_proposalid = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         $this->db = $db;
         $this->socid = $socid;
@@ -184,16 +184,16 @@ 
         $this->remise_absolue = 0;
 
         $langs->load("supplier_proposal");
-        $this->labelstatut[0]=$langs->trans("SupplierProposalStatusDraft");
-        $this->labelstatut[1]=$langs->trans("SupplierProposalStatusValidated");
-        $this->labelstatut[2]=$langs->trans("SupplierProposalStatusSigned");
-        $this->labelstatut[3]=$langs->trans("SupplierProposalStatusNotSigned");
-        $this->labelstatut[4]=$langs->trans("SupplierProposalStatusClosed");
-        $this->labelstatut_short[0]=$langs->trans("SupplierProposalStatusDraftShort");
-        $this->labelstatut_short[1]=$langs->trans("Opened");
-        $this->labelstatut_short[2]=$langs->trans("SupplierProposalStatusSignedShort");
-        $this->labelstatut_short[3]=$langs->trans("SupplierProposalStatusNotSignedShort");
-        $this->labelstatut_short[4]=$langs->trans("SupplierProposalStatusClosedShort");
+        $this->labelstatut[0] = $langs->trans("SupplierProposalStatusDraft");
+        $this->labelstatut[1] = $langs->trans("SupplierProposalStatusValidated");
+        $this->labelstatut[2] = $langs->trans("SupplierProposalStatusSigned");
+        $this->labelstatut[3] = $langs->trans("SupplierProposalStatusNotSigned");
+        $this->labelstatut[4] = $langs->trans("SupplierProposalStatusClosed");
+        $this->labelstatut_short[0] = $langs->trans("SupplierProposalStatusDraftShort");
+        $this->labelstatut_short[1] = $langs->trans("Opened");
+        $this->labelstatut_short[2] = $langs->trans("SupplierProposalStatusSignedShort");
+        $this->labelstatut_short[3] = $langs->trans("SupplierProposalStatusNotSignedShort");
+        $this->labelstatut_short[4] = $langs->trans("SupplierProposalStatusClosedShort");
     }
 
 
@@ -209,28 +209,28 @@ 
      *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
      *			insere dans tableau $this->products
      */
-    function add_product($idproduct, $qty, $remise_percent=0)
+    function add_product($idproduct, $qty, $remise_percent = 0)
     {
         global $conf, $mysoc;
 
-        if (! $qty) $qty = 1;
+        if (!$qty) $qty = 1;
 
         dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
         if ($idproduct > 0)
         {
-            $prod=new Product($this->db);
+            $prod = new Product($this->db);
             $prod->fetch($idproduct);
 
             $productdesc = $prod->description;
 
-            $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
-            $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
-            if (empty($tva_tx)) $tva_npr=0;
-            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
-            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
+            $tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
+            $tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
+            if (empty($tva_tx)) $tva_npr = 0;
+            $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
+            $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
 
             // multiprix
-            if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
+            if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
             }
@@ -241,14 +241,14 @@ 
 
             $line = new SupplierProposalLine($this->db);
 
-            $line->fk_product=$idproduct;
-            $line->desc=$productdesc;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->tva_tx=$tva_tx;
+            $line->fk_product = $idproduct;
+            $line->desc = $productdesc;
+            $line->qty = $qty;
+            $line->subprice = $price;
+            $line->remise_percent = $remise_percent;
+            $line->tva_tx = $tva_tx;
 
-            $this->lines[]=$line;
+            $this->lines[] = $line;
         }
     }
 
@@ -267,42 +267,42 @@ 
 
         $this->db->begin();
 
-        $remise=new DiscountAbsolute($this->db);
-        $result=$remise->fetch($idremise);
+        $remise = new DiscountAbsolute($this->db);
+        $result = $remise->fetch($idremise);
 
         if ($result > 0)
         {
             if ($remise->fk_facture)	// Protection against multiple submission
             {
-                $this->error=$langs->trans("ErrorDiscountAlreadyUsed");
+                $this->error = $langs->trans("ErrorDiscountAlreadyUsed");
                 $this->db->rollback();
                 return -5;
             }
 
-            $supplier_proposalligne=new SupplierProposalLine($this->db);
-            $supplier_proposalligne->fk_supplier_proposal=$this->id;
-            $supplier_proposalligne->fk_remise_except=$remise->id;
-            $supplier_proposalligne->desc=$remise->description;   	// Description ligne
-            $supplier_proposalligne->tva_tx=$remise->tva_tx;
-            $supplier_proposalligne->subprice=-$remise->amount_ht;
-            $supplier_proposalligne->fk_product=0;					// Id produit predefini
-            $supplier_proposalligne->qty=1;
-            $supplier_proposalligne->remise=0;
-            $supplier_proposalligne->remise_percent=0;
-            $supplier_proposalligne->rang=-1;
-            $supplier_proposalligne->info_bits=2;
+            $supplier_proposalligne = new SupplierProposalLine($this->db);
+            $supplier_proposalligne->fk_supplier_proposal = $this->id;
+            $supplier_proposalligne->fk_remise_except = $remise->id;
+            $supplier_proposalligne->desc = $remise->description; // Description ligne
+            $supplier_proposalligne->tva_tx = $remise->tva_tx;
+            $supplier_proposalligne->subprice = -$remise->amount_ht;
+            $supplier_proposalligne->fk_product = 0; // Id produit predefini
+            $supplier_proposalligne->qty = 1;
+            $supplier_proposalligne->remise = 0;
+            $supplier_proposalligne->remise_percent = 0;
+            $supplier_proposalligne->rang = -1;
+            $supplier_proposalligne->info_bits = 2;
 
             // TODO deprecated
-            $supplier_proposalligne->price=-$remise->amount_ht;
+            $supplier_proposalligne->price = -$remise->amount_ht;
 
             $supplier_proposalligne->total_ht  = -$remise->amount_ht;
             $supplier_proposalligne->total_tva = -$remise->amount_tva;
             $supplier_proposalligne->total_ttc = -$remise->amount_ttc;
 
-            $result=$supplier_proposalligne->insert();
+            $result = $supplier_proposalligne->insert();
             if ($result > 0)
             {
-                $result=$this->update_price(1);
+                $result = $this->update_price(1);
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -316,7 +316,7 @@ 
             }
             else
             {
-                $this->error=$supplier_proposalligne->error;
+                $this->error = $supplier_proposalligne->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -362,7 +362,7 @@ 
      *
      *    	@see       	add_product
      */
-    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin='', $origin_id=0)
+    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $pu_ttc = 0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $array_option = 0, $ref_fourn = '', $fk_unit = '', $origin = '', $origin_id = 0)
     {
     	global $mysoc;
 
@@ -370,27 +370,27 @@ 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
-        $txtva=price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-    		$pa_ht=price2num($pa_ht);
-        if ($price_base_type=='HT')
+        if (empty($remise_percent)) $remise_percent = 0;
+        if (empty($qty)) $qty = 0;
+        if (empty($info_bits)) $info_bits = 0;
+        if (empty($rang)) $rang = 0;
+        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
+
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
+        $pu_ht = price2num($pu_ht);
+        $pu_ttc = price2num($pu_ttc);
+        $txtva = price2num($txtva);
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
+    		$pa_ht = price2num($pa_ht);
+        if ($price_base_type == 'HT')
         {
-            $pu=$pu_ht;
+            $pu = $pu_ht;
         }
         else
         {
-            $pu=$pu_ttc;
+            $pu = $pu_ttc;
         }
 
         // Check parameters
@@ -405,10 +405,10 @@ 
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
-            $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -416,7 +416,7 @@ 
             $total_localtax2 = $tabprice[10];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 
@@ -439,33 +439,33 @@ 
             }
 
             // Insert line
-            $this->line=new SupplierProposalLine($this->db);
-
-            $this->line->fk_supplier_proposal=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$txlocaltax1;
-            $this->line->localtax2_tx=$txlocaltax2;
+            $this->line = new SupplierProposalLine($this->db);
+
+            $this->line->fk_supplier_proposal = $this->id;
+            $this->line->label = $label;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
+            $this->line->tva_tx = $txtva;
+            $this->line->localtax1_tx = $txlocaltax1;
+            $this->line->localtax2_tx = $txlocaltax2;
 			$this->line->localtax1_type = $localtaxes_type[0];
 			$this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-            $this->line->remise_percent=$remise_percent;
-            $this->line->subprice=$pu_ht;
-            $this->line->rang=$rangtouse;
-            $this->line->info_bits=$info_bits;
-            $this->line->total_ht=$total_ht;
-            $this->line->total_tva=$total_tva;
-            $this->line->total_localtax1=$total_localtax1;
-            $this->line->total_localtax2=$total_localtax2;
-            $this->line->total_ttc=$total_ttc;
-            $this->line->product_type=$type;
-            $this->line->special_code=$special_code;
-            $this->line->fk_parent_line=$fk_parent_line;
-            $this->line->fk_unit=$fk_unit;
-            $this->line->origin=$origin;
-            $this->line->origin_id=$origin_id;
+            $this->line->fk_product = $fk_product;
+            $this->line->remise_percent = $remise_percent;
+            $this->line->subprice = $pu_ht;
+            $this->line->rang = $rangtouse;
+            $this->line->info_bits = $info_bits;
+            $this->line->total_ht = $total_ht;
+            $this->line->total_tva = $total_tva;
+            $this->line->total_localtax1 = $total_localtax1;
+            $this->line->total_localtax2 = $total_localtax2;
+            $this->line->total_ttc = $total_ttc;
+            $this->line->product_type = $type;
+            $this->line->special_code = $special_code;
+            $this->line->fk_parent_line = $fk_parent_line;
+            $this->line->fk_unit = $fk_unit;
+            $this->line->origin = $origin;
+            $this->line->origin_id = $origin_id;
 			$this->line->ref_fourn = $this->db->escape($ref_fourn);
 
 			// infos marge
@@ -481,32 +481,32 @@ 
 			$this->line->pa_ht = $pa_ht;
 
 			// Multicurrency
-			$this->line->fk_multicurrency			= $this->fk_multicurrency;
-			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->fk_multicurrency = $this->fk_multicurrency;
+			$this->line->multicurrency_code = $this->multicurrency_code;
 			$this->line->multicurrency_subprice		= price2num($pu_ht * $this->multicurrency_tx);
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
             // Mise en option de la ligne
-            if (empty($qty) && empty($special_code)) $this->line->special_code=3;
+            if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
 
             // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+            $this->line->price = $price;
+            $this->line->remise = $remise;
 
-            if (is_array($array_option) && count($array_option)>0) {
-            	$this->line->array_options=$array_option;
+            if (is_array($array_option) && count($array_option) > 0) {
+            	$this->line->array_options = $array_option;
             }
 
-            $result=$this->line->insert();
+            $result = $this->line->insert();
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
                 // Mise a jour informations denormalisees au niveau de la propale meme
-                $result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+                $result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -514,14 +514,14 @@ 
                 }
                 else
                 {
-                    $this->error=$this->db->error();
+                    $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
             }
             else
             {
-                $this->error=$this->line->error;
+                $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -554,23 +554,23 @@ 
 	 *	@param		int			$fk_unit			Id of the unit to use.
      *  @return     int     		        		0 if OK, <0 if KO
      */
-	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $array_option=0, $ref_fourn='', $fk_unit='')
+	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $array_option = 0, $ref_fourn = '', $fk_unit = '')
     {
-        global $conf,$user,$langs, $mysoc;
+        global $conf, $user, $langs, $mysoc;
 
         dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
         $pu = price2num($pu);
         $txtva = price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-    	$pa_ht=price2num($pa_ht);
-        if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
-        if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
+    	$pa_ht = price2num($pa_ht);
+        if (empty($qty) && empty($special_code)) $special_code = 3; // Set option tag
+        if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
 
         if ($this->statut == 0)
         {
@@ -581,10 +581,10 @@ 
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
-            $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -592,7 +592,7 @@ 
             $total_localtax2 = $tabprice[10];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 
@@ -605,15 +605,15 @@ 
             }
 
             // Update line
-            $this->line=new SupplierProposalLine($this->db);
+            $this->line = new SupplierProposalLine($this->db);
 
             // Stock previous line records
-            $staticline=new SupplierProposalLine($this->db);
+            $staticline = new SupplierProposalLine($this->db);
             $staticline->fetch($rowid);
             $this->line->oldline = $staticline;
 
             // Reorder if fk_parent_line change
-            if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
+            if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
             {
                 $rangmax = $this->line_max($fk_parent_line);
                 $this->line->rang = $rangmax + 1;
@@ -621,15 +621,15 @@ 
 
             $this->line->rowid				= $rowid;
             $this->line->label				= $label;
-            $this->line->desc				= $desc;
-            $this->line->qty				= $qty;
-            $this->line->product_type			= $type;
-            $this->line->tva_tx				= $txtva;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
+            $this->line->product_type = $type;
+            $this->line->tva_tx = $txtva;
             $this->line->localtax1_tx		= $txlocaltax1;
             $this->line->localtax2_tx		= $txlocaltax2;
 			$this->line->localtax1_type		= $localtaxes_type[0];
 			$this->line->localtax2_type		= $localtaxes_type[2];
-            $this->line->remise_percent		= $remise_percent;
+            $this->line->remise_percent = $remise_percent;
             $this->line->subprice			= $pu;
             $this->line->info_bits			= $info_bits;
             $this->line->total_ht			= $total_ht;
@@ -637,11 +637,11 @@ 
             $this->line->total_localtax1	= $total_localtax1;
             $this->line->total_localtax2	= $total_localtax2;
             $this->line->total_ttc			= $total_ttc;
-            $this->line->special_code		= $special_code;
+            $this->line->special_code = $special_code;
             $this->line->fk_parent_line		= $fk_parent_line;
-            $this->line->skip_update_total	= $skip_update_total;
-            $this->line->ref_fourn			= $ref_fourn;
-			$this->line->fk_unit			= $fk_unit;
+            $this->line->skip_update_total = $skip_update_total;
+            $this->line->ref_fourn = $ref_fourn;
+			$this->line->fk_unit = $fk_unit;
 
             // infos marge
             if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
@@ -656,11 +656,11 @@ 
             $this->line->pa_ht = $pa_ht;
 
             // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+            $this->line->price = $price;
+            $this->line->remise = $remise;
 
-            if (is_array($array_option) && count($array_option)>0) {
-            	$this->line->array_options=$array_option;
+            if (is_array($array_option) && count($array_option) > 0) {
+            	$this->line->array_options = $array_option;
             }
 
 			// Multicurrency
@@ -669,11 +669,11 @@ 
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $result=$this->line->update();
+            $result = $this->line->update();
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
                 $this->update_price(1);
 
@@ -685,7 +685,7 @@ 
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 $this->db->rollback();
                 return -1;
             }
@@ -708,7 +708,7 @@ 
     {
         if ($this->statut == 0)
         {
-            $line=new SupplierProposalLine($this->db);
+            $line = new SupplierProposalLine($this->db);
 
             // For triggers
             $line->fetch($lineid);
@@ -739,39 +739,39 @@ 
      * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *  @return     int     			<0 if KO, >=0 if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
-        global $langs,$conf,$mysoc,$hookmanager;
-        $error=0;
+        global $langs, $conf, $mysoc, $hookmanager;
+        $error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         dol_syslog(get_class($this)."::create");
 
         // Check parameters
-        $result=$this->fetch_thirdparty();
+        $result = $this->fetch_thirdparty();
         if ($result < 0)
         {
-            $this->error="Failed to fetch company";
+            $this->error = "Failed to fetch company";
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -3;
         }
 
         // Check parameters
-		if (! empty($this->ref))	// We check that ref is not already used
+		if (!empty($this->ref))	// We check that ref is not already used
 		{
-			$result=self::isExistingObject($this->element, 0, $this->ref);	// Check ref is not yet used
+			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
 			if ($result > 0)
 			{
-				$this->error='ErrorRefAlreadyExists';
-				dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING);
+				$this->error = 'ErrorRefAlreadyExists';
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
 				return -1;
 			}
 		}
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -783,80 +783,80 @@ 
 
         // Insert into database
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
-        $sql.= "fk_soc";
-        $sql.= ", price";
-        $sql.= ", remise";
-        $sql.= ", remise_percent";
-        $sql.= ", remise_absolue";
-        $sql.= ", tva";
-        $sql.= ", total";
-        $sql.= ", datec";
-        $sql.= ", ref";
-        $sql.= ", fk_user_author";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", model_pdf";
-        $sql.= ", fk_cond_reglement";
-        $sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", date_livraison";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_projet";
-        $sql.= ", entity";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ") ";
-        $sql.= " VALUES (";
-        $sql.= $this->socid;
-        $sql.= ", 0";
-        $sql.= ", ".$this->remise;
-        $sql.= ", ".($this->remise_percent?$this->db->escape($this->remise_percent):'null');
-        $sql.= ", ".($this->remise_absolue?$this->db->escape($this->remise_absolue):'null');
-        $sql.= ", 0";
-        $sql.= ", 0";
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", '(PROV)'";
-        $sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql.= ", ".$this->cond_reglement_id;
-        $sql.= ", ".$this->mode_reglement_id;
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".$conf->entity;
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+        $sql .= "fk_soc";
+        $sql .= ", price";
+        $sql .= ", remise";
+        $sql .= ", remise_percent";
+        $sql .= ", remise_absolue";
+        $sql .= ", tva";
+        $sql .= ", total";
+        $sql .= ", datec";
+        $sql .= ", ref";
+        $sql .= ", fk_user_author";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", model_pdf";
+        $sql .= ", fk_cond_reglement";
+        $sql .= ", fk_mode_reglement";
+        $sql .= ", fk_account";
+        $sql .= ", date_livraison";
+        $sql .= ", fk_shipping_method";
+        $sql .= ", fk_projet";
+        $sql .= ", entity";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+        $sql .= ") ";
+        $sql .= " VALUES (";
+        $sql .= $this->socid;
+        $sql .= ", 0";
+        $sql .= ", ".$this->remise;
+        $sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'null');
+        $sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'null');
+        $sql .= ", 0";
+        $sql .= ", 0";
+        $sql .= ", '".$this->db->idate($now)."'";
+        $sql .= ", '(PROV)'";
+        $sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "null");
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", '".$this->db->escape($this->modelpdf)."'";
+        $sql .= ", ".$this->cond_reglement_id;
+        $sql .= ", ".$this->mode_reglement_id;
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+        $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+        $sql .= ", ".($this->fk_project ? $this->fk_project : "null");
+        $sql .= ", ".$conf->entity;
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".(double) $this->multicurrency_tx;
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."supplier_proposal");
 
             if ($this->id)
             {
-                $this->ref='(PROV'.$this->id.')';
+                $this->ref = '(PROV'.$this->id.')';
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
                 dol_syslog(get_class($this)."::create", LOG_DEBUG);
-                $resql=$this->db->query($sql);
-                if (! $resql) $error++;
+                $resql = $this->db->query($sql);
+                if (!$resql) $error++;
 
                 /*
                  *  Insertion du detail des produits dans la base
                 */
-                if (! $error)
+                if (!$error)
                 {
-                    $fk_parent_line=0;
-                    $num=count($this->lines);
+                    $fk_parent_line = 0;
+                    $num = count($this->lines);
 
-                    for ($i=0;$i<$num;$i++)
+                    for ($i = 0; $i < $num; $i++)
                     {
                         // Reset fk_parent_line for no child products and special product
                         if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
@@ -892,7 +892,7 @@ 
                         if ($result < 0)
                         {
                             $error++;
-                            $this->error=$this->db->error;
+                            $this->error = $this->db->error;
                             dol_print_error($this->db);
                             break;
                         }
@@ -904,29 +904,29 @@ 
                 }
 
                 // Add linked object
-                if (! $error && $this->origin && $this->origin_id)
+                if (!$error && $this->origin && $this->origin_id)
                 {
                     $ret = $this->add_object_linked();
-                    if (! $ret)	dol_print_error($this->db);
+                    if (!$ret)	dol_print_error($this->db);
                 }
 
-                if (! $error)
+                if (!$error)
                 {
                     // Mise a jour infos denormalisees
-                    $resql=$this->update_price(1);
+                    $resql = $this->update_price(1);
                     if ($resql)
                     {
-                    	$action='update';
+                    	$action = 'update';
 
                     	// Actions on extra fields (by external module or standard code)
                     	$hookmanager->initHooks(array('supplier_proposaldao'));
-                    	$parameters=array('socid'=>$this->id);
-                    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                    	$parameters = array('socid'=>$this->id);
+                    	$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                     	if (empty($reshook))
                     	{
                     		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
                     		{
-                    			$result=$this->insertExtraFields();
+                    			$result = $this->insertExtraFields();
                     			if ($result < 0)
                     			{
                     				$error++;
@@ -935,28 +935,28 @@ 
                     	}
                     	else if ($reshook < 0) $error++;
 
-                        if (! $notrigger)
+                        if (!$notrigger)
                         {
                             // Call trigger
-                            $result=$this->call_trigger('PROPAL_SUPPLIER_CREATE',$user);
+                            $result = $this->call_trigger('PROPAL_SUPPLIER_CREATE', $user);
                             if ($result < 0) { $error++; }
                             // End call triggers
                         }
                     }
                     else
 					{
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         $error++;
                     }
                 }
             }
             else
 			{
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
                 dol_syslog(get_class($this)."::create done id=".$this->id);
@@ -970,7 +970,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -986,7 +986,7 @@ 
      */
     function create_from($user)
     {
-        $this->products=$this->lines;
+        $this->products = $this->lines;
 
         return $this->create($user);
     }
@@ -997,33 +997,33 @@ 
      *		@param		int				$socid			Id of thirdparty
      * 	 	@return		int								New id of clone
      */
-    function createFromClone($socid=0)
+    function createFromClone($socid = 0)
     {
-        global $user,$langs,$conf,$hookmanager;
+        global $user, $langs, $conf, $hookmanager;
 
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
         $this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach($this->lines as $line)
+		foreach ($this->lines as $line)
 			$line->fetch_optionals($line->rowid);
 
 		// Load source object
 		$objFrom = clone $this;
 
-        $objsoc=new Societe($this->db);
+        $objsoc = new Societe($this->db);
 
         // Change socid if needed
-        if (! empty($socid) && $socid != $this->socid)
+        if (!empty($socid) && $socid != $this->socid)
         {
             if ($objsoc->fetch($socid) > 0)
             {
-                $this->socid 				= $objsoc->id;
-                $this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                $this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $this->fk_project			= '';
+                $this->socid = $objsoc->id;
+                $this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+                $this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+                $this->fk_project = '';
             }
 
             // TODO Change product price if multi-prices
@@ -1033,49 +1033,49 @@ 
             $objsoc->fetch($this->socid);
         }
 
-        $this->id=0;
-        $this->statut=0;
+        $this->id = 0;
+        $this->statut = 0;
 
-        if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
+        if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
         {
-            $this->error='ErrorSetupNotComplete';
+            $this->error = 'ErrorSetupNotComplete';
             return -1;
         }
 
         // Clear fields
-        $this->user_author	= $user->id;
-        $this->user_valid	= '';
-        $this->date			= $now;
+        $this->user_author = $user->id;
+        $this->user_valid = '';
+        $this->date = $now;
 
         // Set ref
-        require_once DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
+        require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
         $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
         $modSupplierProposal = new $obj;
-        $this->ref = $modSupplierProposal->getNextValue($objsoc,$this);
+        $this->ref = $modSupplierProposal->getNextValue($objsoc, $this);
 
         // Create clone
-        $result=$this->create($user);
+        $result = $this->create($user);
         if ($result < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
             // Hook of thirdparty module
             if (is_object($hookmanager))
             {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('objFrom'=>$objFrom);
+                $action = '';
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
 
             // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PROPOSAL_CLONE',$user);
+            $result = $this->call_trigger('SUPPLIER_PROPOSAL_CLONE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
 
         // End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $this->id;
@@ -1094,37 +1094,37 @@ 
      *	@param		string		$ref		Ref of proposal
      *	@return     int         			>0 if OK, <0 if KO
      */
-    function fetch($rowid,$ref='')
+    function fetch($rowid, $ref = '')
     {
         global $conf;
 
         $sql = "SELECT p.rowid, p.ref, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
-        $sql.= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
-        $sql.= ", p.datec";
-        $sql.= ", p.date_valid as datev";
-        $sql.= ", p.date_livraison as date_livraison";
-        $sql.= ", p.model_pdf, p.extraparams";
-        $sql.= ", p.note_private, p.note_public";
-        $sql.= ", p.fk_projet, p.fk_statut";
-        $sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
-        $sql.= ", p.fk_cond_reglement";
-        $sql.= ", p.fk_mode_reglement";
-        $sql.= ', p.fk_account';
-        $sql.= ", p.fk_shipping_method";
-		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
-        $sql.= ", c.label as statut_label";
-        $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
-        $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN (' . getEntity('c_paiement').')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term').')';
-        $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity = ".$conf->entity;
-        if ($ref) $sql.= " AND p.ref='".$ref."'";
-        else $sql.= " AND p.rowid=".$rowid;
+        $sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
+        $sql .= ", p.datec";
+        $sql .= ", p.date_valid as datev";
+        $sql .= ", p.date_livraison as date_livraison";
+        $sql .= ", p.model_pdf, p.extraparams";
+        $sql .= ", p.note_private, p.note_public";
+        $sql .= ", p.fk_projet, p.fk_statut";
+        $sql .= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
+        $sql .= ", p.fk_cond_reglement";
+        $sql .= ", p.fk_mode_reglement";
+        $sql .= ', p.fk_account';
+        $sql .= ", p.fk_shipping_method";
+		$sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
+        $sql .= ", c.label as statut_label";
+        $sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
+        $sql .= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN ('.getEntity('c_paiement').')';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN ('.getEntity('c_payment_term').')';
+        $sql .= " WHERE p.fk_statut = c.id";
+        $sql .= " AND p.entity = ".$conf->entity;
+        if ($ref) $sql .= " AND p.ref='".$ref."'";
+        else $sql .= " AND p.rowid=".$rowid;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
@@ -1153,21 +1153,21 @@ 
                 $this->statut_libelle       = $obj->statut_label;
                 $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
                 $this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
-                $this->date_creation		= $this->db->jdate($obj->datec); //Creation date
-                $this->date_validation		= $this->db->jdate($obj->datev); //Validation date
+                $this->date_creation = $this->db->jdate($obj->datec); //Creation date
+                $this->date_validation = $this->db->jdate($obj->datev); //Validation date
                 $this->date_livraison       = $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+                $this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
 
                 $this->mode_reglement_id    = $obj->fk_mode_reglement;
                 $this->mode_reglement_code  = $obj->mode_reglement_code;
                 $this->mode_reglement       = $obj->mode_reglement;
-                $this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
+                $this->fk_account           = ($obj->fk_account > 0) ? $obj->fk_account : null;
                 $this->cond_reglement_id    = $obj->fk_cond_reglement;
                 $this->cond_reglement_code  = $obj->cond_reglement_code;
                 $this->cond_reglement       = $obj->cond_reglement;
                 $this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
 
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
+                $this->extraparams = (array) json_decode($obj->extraparams, true);
 
                 $this->user_author_id = $obj->fk_user_author;
                 $this->user_valid_id  = $obj->fk_user_valid;
@@ -1175,9 +1175,9 @@ 
 
 				// Multicurrency
 				$this->fk_multicurrency 		= $obj->fk_multicurrency;
-				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_code = $obj->multicurrency_code;
 				$this->multicurrency_tx 		= $obj->multicurrency_tx;
-				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
@@ -1189,9 +1189,9 @@ 
                 // Retreive all extrafield for invoice
                 // fetch optionals attributes and labels
                 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $extrafields = new ExtraFields($this->db);
+                $extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+                $this->fetch_optionals($this->id, $extralabels);
 
                 $this->db->free($resql);
 
@@ -1201,14 +1201,14 @@ 
                  * Lignes askprice liees a un produit ou non
                  */
                 $sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
-				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
-                $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-                $sql.= ' d.ref_fourn as ref_produit_fourn,';
-				$sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
-                $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-                $sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
-                $sql.= " ORDER by d.rang";
+				$sql .= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
+                $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+                $sql .= ' d.ref_fourn as ref_produit_fourn,';
+				$sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
+                $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
+                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
+                $sql .= " WHERE d.fk_supplier_proposal = ".$this->id;
+                $sql .= " ORDER by d.rang";
 
                 $result = $this->db->query($sql);
                 if ($result)
@@ -1222,13 +1222,13 @@ 
 
                         $line                   = new SupplierProposalLine($this->db);
 
-                        $line->rowid			= $objp->rowid; // deprecated
-                        $line->id				= $objp->rowid;
-                        $line->fk_supplier_proposal		= $objp->fk_supplier_proposal;
-                        $line->fk_parent_line	= $objp->fk_parent_line;
+                        $line->rowid = $objp->rowid; // deprecated
+                        $line->id = $objp->rowid;
+                        $line->fk_supplier_proposal = $objp->fk_supplier_proposal;
+                        $line->fk_parent_line = $objp->fk_parent_line;
                         $line->product_type     = $objp->product_type;
                         $line->label            = $objp->custom_label;
-                        $line->desc             = $objp->description;  // Description ligne
+                        $line->desc             = $objp->description; // Description ligne
                         $line->qty              = $objp->qty;
                         $line->tva_tx           = $objp->tva_tx;
                         $line->localtax1_tx		= $objp->localtax1_tx;
@@ -1236,7 +1236,7 @@ 
                         $line->subprice         = $objp->subprice;
                         $line->fk_remise_except = $objp->fk_remise_except;
                         $line->remise_percent   = $objp->remise_percent;
-                        $line->price            = $objp->price;		// TODO deprecated
+                        $line->price            = $objp->price; // TODO deprecated
 
                         $line->info_bits        = $objp->info_bits;
                         $line->total_ht         = $objp->total_ht;
@@ -1244,9 +1244,9 @@ 
                         $line->total_localtax1	= $objp->total_localtax1;
                         $line->total_localtax2	= $objp->total_localtax2;
                         $line->total_ttc        = $objp->total_ttc;
-      					$line->fk_fournprice 	= $objp->fk_fournprice;
-						$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-						$line->pa_ht 			= $marginInfos[0];
+      					$line->fk_fournprice = $objp->fk_fournprice;
+						$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+						$line->pa_ht = $marginInfos[0];
 						$line->marge_tx			= $marginInfos[1];
 						$line->marque_tx		= $marginInfos[2];
                         $line->special_code     = $objp->special_code;
@@ -1254,25 +1254,25 @@ 
 
                         $line->fk_product       = $objp->fk_product;
 
-                        $line->ref				= $objp->product_ref;		// TODO deprecated
-                        $line->product_ref		= $objp->product_ref;
-                        $line->libelle			= $objp->product_label;		// TODO deprecated
-                        $line->product_label	= $objp->product_label;
-                        $line->product_desc     = $objp->product_desc; 		// Description produit
+                        $line->ref = $objp->product_ref; // TODO deprecated
+                        $line->product_ref = $objp->product_ref;
+                        $line->libelle = $objp->product_label; // TODO deprecated
+                        $line->product_label = $objp->product_label;
+                        $line->product_desc     = $objp->product_desc; // Description produit
                         $line->fk_product_type  = $objp->fk_product_type;
 
-						$line->ref_fourn		= $objp->ref_produit_fourn;
+						$line->ref_fourn = $objp->ref_produit_fourn;
 
 						// Multicurrency
-						$line->fk_multicurrency 		= $objp->fk_multicurrency;
-						$line->multicurrency_code 		= $objp->multicurrency_code;
+						$line->fk_multicurrency = $objp->fk_multicurrency;
+						$line->multicurrency_code = $objp->multicurrency_code;
 						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
 						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
 						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
 						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-						$line->fk_unit					= $objp->fk_unit;
+						$line->fk_unit = $objp->fk_unit;
 
-                        $this->lines[$i]        = $line;
+                        $this->lines[$i] = $line;
 
                         $i++;
                     }
@@ -1280,26 +1280,26 @@ 
                 }
                 else
                 {
-                    $this->error=$this->db->error();
+                    $this->error = $this->db->error();
                     return -1;
                 }
 
                 // Retreive all extrafield for askprice
                 // fetch optionals attributes and labels
                 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $extrafields = new ExtraFields($this->db);
+                $extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+                $this->fetch_optionals($this->id, $extralabels);
 
                 return 1;
             }
 
-            $this->error="Record Not Found";
+            $this->error = "Record Not Found";
             return 0;
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -1312,17 +1312,17 @@ 
      */
     function update_extrafields($user)
     {
-    	$action='update';
+    	$action = 'update';
 
     	// Actions on extra fields (by external module or standard code)
     	$hookmanager->initHooks(array('supplier_proposaldao'));
-    	$parameters=array('id'=>$this->id);
-    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+    	$parameters = array('id'=>$this->id);
+    	$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
     	if (empty($reshook))
     	{
     		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
     		{
-    			$result=$this->insertExtraFields();
+    			$result = $this->insertExtraFields();
     			if ($result < 0)
     			{
     				$error++;
@@ -1349,17 +1349,17 @@ 
      *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *  @return int         		<0 if KO, >=0 if OK
      */
-    function valid($user, $notrigger=0)
+    function valid($user, $notrigger = 0)
     {
     	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    	global $conf,$langs;
+    	global $conf, $langs;
 
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate_advance)))
+        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
         {
             $this->db->begin();
 
@@ -1368,7 +1368,7 @@ 
             $soc->fetch($this->socid);
 
             // Define new ref
-            if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+            if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
             {
             	$num = $this->getNextNumRef($soc);
             }
@@ -1379,28 +1379,28 @@ 
             $this->newref = $num;
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-            $sql.= " SET ref = '".$num."',";
-            $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql .= " SET ref = '".$num."',";
+            $sql .= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
             dol_syslog(get_class($this)."::valid", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				dol_print_error($this->db);
 				$error++;
 			}
 
    			// Trigger calls
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE',$user);
+                $result = $this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->oldref = $this->ref;
 
@@ -1421,24 +1421,24 @@ 
             			{
             				dol_syslog("Rename ok");
             				// Rename docs starting with $oldref with $newref
-            				$listoffiles=dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-            				foreach($listoffiles as $fileentry)
+            				$listoffiles = dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+            				foreach ($listoffiles as $fileentry)
             				{
-            					$dirsource=$fileentry['name'];
-            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-            					$dirsource=$fileentry['path'].'/'.$dirsource;
-            					$dirdest=$fileentry['path'].'/'.$dirdest;
+            					$dirsource = $fileentry['name'];
+            					$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+            					$dirsource = $fileentry['path'].'/'.$dirsource;
+            					$dirdest = $fileentry['path'].'/'.$dirdest;
             					@rename($dirsource, $dirdest);
             				}
             			}
             		}
             	}
 
-            	$this->ref=$num;
-            	$this->brouillon=0;
+            	$this->ref = $num;
+            	$this->brouillon = 0;
             	$this->statut = 1;
-            	$this->user_valid_id=$user->id;
-            	$this->datev=$now;
+            	$this->user_valid_id = $user->id;
+            	$this->datev = $now;
 
             	$this->db->commit();
             	return 1;
@@ -1460,11 +1460,11 @@ 
      */
     function set_date_livraison($user, $date_livraison)
     {
-        if (! empty($user->rights->supplier_proposal->creer))
+        if (!empty($user->rights->supplier_proposal->creer))
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id;
 
             if ($this->db->query($sql))
             {
@@ -1473,7 +1473,7 @@ 
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
                 return -1;
             }
@@ -1489,16 +1489,16 @@ 
      */
     function set_remise_percent($user, $remise)
     {
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
-        if (! empty($user->rights->supplier_proposal->creer))
+        if (!empty($user->rights->supplier_proposal->creer))
         {
             $remise = price2num($remise);
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            if ($this->db->query($sql) )
+            if ($this->db->query($sql))
             {
                 $this->remise_percent = $remise;
                 $this->update_price(1);
@@ -1506,7 +1506,7 @@ 
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
         }
@@ -1522,17 +1522,17 @@ 
      */
     function set_remise_absolue($user, $remise)
     {
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
-        if (! empty($user->rights->supplier_proposal->creer))
+        if (!empty($user->rights->supplier_proposal->creer))
         {
             $remise = price2num($remise);
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql.= " SET remise_absolue = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql .= " SET remise_absolue = ".$remise;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            if ($this->db->query($sql) )
+            if ($this->db->query($sql))
             {
                 $this->remise_absolue = $remise;
                 $this->update_price(1);
@@ -1540,7 +1540,7 @@ 
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
         }
@@ -1557,32 +1557,32 @@ 
      *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return     int         		<0 if KO, >0 if OK
      */
-    function reopen($user, $statut, $note='', $notrigger=0)
+    function reopen($user, $statut, $note = '', $notrigger = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->statut = $statut;
-        $error=0;
+        $error = 0;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".$this->statut.",";
-		if (! empty($note)) $sql.= " note_private = '".$this->db->escape($note)."',";
-        $sql.= " date_cloture=NULL, fk_user_cloture=NULL";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".$this->statut.",";
+		if (!empty($note)) $sql .= " note_private = '".$this->db->escape($note)."',";
+        $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
+        $sql .= " WHERE rowid = ".$this->id;
 
     	$this->db->begin();
 
 		dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error++; $this->errors[]="Error ".$this->db->lasterror();
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN',$user);
+                $result = $this->call_trigger('SUPPLIER_PROPOSAL_REOPEN', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
@@ -1593,14 +1593,14 @@ 
 		{
 		    if (!empty($this->errors))
 		    {
-    			foreach($this->errors as $errmsg)
+    			foreach ($this->errors as $errmsg)
     			{
     				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-    				$this->error.=($this->error?', '.$errmsg:$errmsg);
+    				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
     			}
 		    }
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -1620,30 +1620,30 @@ 
      */
     function cloture($user, $statut, $note)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->statut = $statut;
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-        	$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
-        	$trigger_name='SUPPLIER_PROPOSAL_CLOSE_REFUSED';
+        	$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
+        	$trigger_name = 'SUPPLIER_PROPOSAL_CLOSE_REFUSED';
 
             if ($statut == 2)
             {
-            	$trigger_name='SUPPLIER_PROPOSAL_CLOSE_SIGNED';
-				$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+            	$trigger_name = 'SUPPLIER_PROPOSAL_CLOSE_SIGNED';
+				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
 
-                if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
+                if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
                 {
                     $result = $this->updateOrCreatePriceFournisseur($user);
                 }
@@ -1651,17 +1651,17 @@ 
             }
             if ($statut == 4)
             {
-            	$trigger_name='SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
+            	$trigger_name = 'SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
             }
 
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
              	// Define output language
               	$outputlangs = $langs;
-               	if (! empty($conf->global->MAIN_MULTILANGS))
+               	if (!empty($conf->global->MAIN_MULTILANGS))
                	{
-               		$outputlangs = new Translate("",$conf);
-               		$newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang);
+               		$outputlangs = new Translate("", $conf);
+               		$newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
                		$outputlangs->setDefaultLang($newlang);
                	}
                	//$ret=$object->fetch($id);    // Reload to get new records
@@ -1669,11 +1669,11 @@ 
             }
 
             // Call trigger
-            $result=$this->call_trigger($trigger_name,$user);
+            $result = $this->call_trigger($trigger_name, $user);
             if ($result < 0) { $error++; }
             // End call triggers
 
-            if ( ! $error )
+            if (!$error)
             {
                 $this->db->commit();
                 return 1;
@@ -1686,8 +1686,8 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -1734,14 +1734,14 @@ 
      *	@return     int         					<0 if KO, >0 if OK
      */
      function updatePriceFournisseur($idProductFournPrice, $product, $user) {
-		$price=price2num($product->subprice*$product->qty,'MU');
-		$unitPrice = price2num($product->subprice,'MU');
+		$price = price2num($product->subprice * $product->qty, 'MU');
+		$unitPrice = price2num($product->subprice, 'MU');
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_fournisseur_price SET '.(!empty($product->ref_fourn) ? 'ref_fourn = "'.$product->ref_fourn.'", ' : '').' price ='.$price.', unitprice ='.$unitPrice.' WHERE rowid = '.$idProductFournPrice;
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
             $this->db->rollback();
             return -1;
 		}
@@ -1755,10 +1755,10 @@ 
      *	@return     int         			<0 if KO, >0 if OK
      */
 	 function createPriceFournisseur($product, $user) {
-	 	$price=price2num($product->subprice*$product->qty,'MU');
-	    $qty=price2num($product->qty);
-		$unitPrice = price2num($product->subprice,'MU');
-		$now=dol_now();
+	 	$price = price2num($product->subprice * $product->qty, 'MU');
+	    $qty = price2num($product->qty);
+		$unitPrice = price2num($product->subprice, 'MU');
+		$now = dol_now();
 
 		$values = array(
 			"'".$this->db->idate($now)."'",
@@ -1777,7 +1777,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
             $this->db->rollback();
             return -1;
 		}
@@ -1791,10 +1791,10 @@ 
      */
     function set_draft($user)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET fk_statut = 0";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         if ($this->db->query($sql))
         {
@@ -1822,32 +1822,32 @@ 
      *    @param    string	$sortorder			Sort order
      *    @return	int		       				-1 if KO, array with result if OK
      */
-    function liste_array($shortlist=0, $draft=0, $notcurrentuser=0, $socid=0, $limit=0, $offset=0, $sortfield='p.datec', $sortorder='DESC')
+    function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datec', $sortorder = 'DESC')
     {
-        global $conf,$user;
+        global $conf, $user;
 
         $ga = array();
 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
-        $sql.= " p.datep as dp, p.fin_validite as datelimite";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE p.entity = ".$conf->entity;
-        $sql.= " AND p.fk_soc = s.rowid";
-        $sql.= " AND p.fk_statut = c.id";
-        if (! $user->rights->societe->client->voir && ! $socid) //restriction
+        $sql .= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
+        $sql .= " p.datep as dp, p.fin_validite as datelimite";
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= " WHERE p.entity = ".$conf->entity;
+        $sql .= " AND p.fk_soc = s.rowid";
+        $sql .= " AND p.fk_statut = c.id";
+        if (!$user->rights->societe->client->voir && !$socid) //restriction
         {
-        	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
         }
-        if ($socid) $sql.= " AND s.rowid = ".$socid;
-        if ($draft)	$sql.= " AND p.fk_statut = 0";
-        if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
-        $sql.= $this->db->order($sortfield,$sortorder);
-        $sql.= $this->db->plimit($limit,$offset);
+        if ($socid) $sql .= " AND s.rowid = ".$socid;
+        if ($draft)	$sql .= " AND p.fk_statut = 0";
+        if ($notcurrentuser > 0) $sql .= " AND p.fk_user_author <> ".$user->id;
+        $sql .= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->plimit($limit, $offset);
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -1868,7 +1868,7 @@ 
                     }
                     else
 					{
-                        $ga[$i]['id']	= $obj->supplier_proposalid;
+                        $ga[$i]['id'] = $obj->supplier_proposalid;
                         $ga[$i]['ref'] 	= $obj->ref;
                         $ga[$i]['name'] = $obj->name;
                     }
@@ -1892,24 +1892,24 @@ 
      *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *	@return	int						1 if ok, otherwise if error
      */
-    function delete($user, $notrigger=0)
+    function delete($user, $notrigger = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
-        if (! $notrigger)
+        if (!$notrigger)
         {
             // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE',$user);
+            $result = $this->call_trigger('SUPPLIER_PROPOSAL_DELETE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
             if ($this->db->query($sql))
@@ -1921,33 +1921,33 @@ 
                     $res = $this->deleteObjectLinked();
                     if ($res < 0) $error++;
 
-                    if (! $error)
+                    if (!$error)
                     {
                         // We remove directory
                         $ref = dol_sanitizeFileName($this->ref);
                         if ($conf->supplier_proposal->dir_output && !empty($this->ref))
                         {
-                            $dir = $conf->supplier_proposal->dir_output . "/" . $ref ;
-                            $file = $dir . "/" . $ref . ".pdf";
+                            $dir = $conf->supplier_proposal->dir_output."/".$ref;
+                            $file = $dir."/".$ref.".pdf";
                             if (file_exists($file))
                             {
                                 dol_delete_preview($this);
 
-                                if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+                                if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
                                 {
-                                    $this->error='ErrorFailToDeleteFile';
-                                    $this->errors=array('ErrorFailToDeleteFile');
+                                    $this->error = 'ErrorFailToDeleteFile';
+                                    $this->errors = array('ErrorFailToDeleteFile');
                                 	$this->db->rollback();
                                     return 0;
                                 }
                             }
                             if (file_exists($dir))
                             {
-                                $res=@dol_delete_dir_recursive($dir);
-                                if (! $res)
+                                $res = @dol_delete_dir_recursive($dir);
+                                if (!$res)
                                 {
-                                    $this->error='ErrorFailToDeleteDir';
-                                    $this->errors=array('ErrorFailToDeleteDir');
+                                    $this->error = 'ErrorFailToDeleteDir';
+                                    $this->errors = array('ErrorFailToDeleteDir');
                                     $this->db->rollback();
                                     return 0;
                                 }
@@ -1956,21 +1956,21 @@ 
                     }
 
                     // Removed extrafields
-                    if (! $error)
+                    if (!$error)
                     {
                     	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
                     	{
-                    		$result=$this->deleteExtraFields();
+                    		$result = $this->deleteExtraFields();
                     		if ($result < 0)
                     		{
                     			$error++;
-                    			$errorflag=-4;
+                    			$errorflag = -4;
                     			dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
                     		}
                     	}
                     }
 
-                    if (! $error)
+                    if (!$error)
                     {
                         dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
                         $this->db->commit();
@@ -1978,21 +1978,21 @@ 
                     }
                     else
                     {
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return 0;
                     }
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -3;
                 }
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
@@ -2013,10 +2013,10 @@ 
     function info($id)
     {
         $sql = "SELECT c.rowid, ";
-        $sql.= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
-        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
-        $sql.= " WHERE c.rowid = ".$id;
+        $sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
+        $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
+        $sql .= " WHERE c.rowid = ".$id;
 
         $result = $this->db->query($sql);
 
@@ -2034,20 +2034,20 @@ 
 
                 $cuser = new User($this->db);
                 $cuser->fetch($obj->fk_user_author);
-                $this->user_creation     = $cuser;
+                $this->user_creation = $cuser;
 
                 if ($obj->fk_user_valid)
                 {
                     $vuser = new User($this->db);
                     $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation     = $vuser;
+                    $this->user_validation = $vuser;
                 }
 
                 if ($obj->fk_user_cloture)
                 {
                     $cluser = new User($this->db);
                     $cluser->fetch($obj->fk_user_cloture);
-                    $this->user_cloture     = $cluser;
+                    $this->user_cloture = $cluser;
                 }
 
 
@@ -2068,9 +2068,9 @@ 
      *    	@param      int			$mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
      *    	@return     string		Label
      */
-    function getLibStatut($mode=0)
+    function getLibStatut($mode = 0)
     {
-        return $this->LibStatut($this->statut,$mode);
+        return $this->LibStatut($this->statut, $mode);
     }
 
     /**
@@ -2080,24 +2080,24 @@ 
      *    	@param      int			$mode      	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
      *    	@return     string		Label
      */
-	function LibStatut($statut,$mode=1)
+	function LibStatut($statut, $mode = 1)
     {
 		global $langs;
 		$langs->load("supplier_proposal");
 
-		if ($statut==0) $statuttrans='statut0';
-		if ($statut==1) $statuttrans='statut1';
-		if ($statut==2) $statuttrans='statut3';
-		if ($statut==3) $statuttrans='statut5';
-		if ($statut==4) $statuttrans='statut6';
+		if ($statut == 0) $statuttrans = 'statut0';
+		if ($statut == 1) $statuttrans = 'statut1';
+		if ($statut == 2) $statuttrans = 'statut3';
+		if ($statut == 3) $statuttrans = 'statut5';
+		if ($statut == 4) $statuttrans = 'statut6';
 
 		if ($mode == 0)	return $this->labelstatut[$statut];
 		if ($mode == 1)	return $this->labelstatut_short[$statut];
 		if ($mode == 2)	return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
 		if ($mode == 3)	return img_picto($this->labelstatut[$statut], $statuttrans);
-		if ($mode == 4)	return img_picto($this->labelstatut[$statut],$statuttrans).' '.$this->labelstatut[$statut];
-		if ($mode == 5)	return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
-		if ($mode == 6)	return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
+		if ($mode == 4)	return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut[$statut];
+		if ($mode == 5)	return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut], $statuttrans);
+		if ($mode == 6)	return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut], $statuttrans);
 	}
 
 
@@ -2108,50 +2108,50 @@ 
      *      @param          int		$mode   "opened" for askprice to close, "signed" for proposal to invoice
      *      @return         int     		<0 if KO, >0 if OK
      */
-    function load_board($user,$mode)
+    function load_board($user, $mode)
     {
         global $conf, $user, $langs;
 
-        $now=dol_now();
+        $now = dol_now();
 
-        $this->nbtodo=$this->nbtodolate=0;
+        $this->nbtodo = $this->nbtodolate = 0;
         $clause = " WHERE";
 
         $sql = "SELECT p.rowid, p.ref, p.datec as datec";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." p.entity = ".$conf->entity;
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+        $sql .= $clause." p.entity = ".$conf->entity;
+        if ($mode == 'opened') $sql .= " AND p.fk_statut = 1";
+        if ($mode == 'signed') $sql .= " AND p.fk_statut = 2";
+        if ($user->societe_id) $sql .= " AND p.fk_soc = ".$user->societe_id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($mode == 'opened') {
-	            $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
+	            $delay_warning = $conf->supplier_proposal->cloture->warning_delay;
 	            $statut = self::STATUS_VALIDATED;
 	            $label = $langs->trans("SupplierProposalsToClose");
             }
             if ($mode == 'signed') {
-	            $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
+	            $delay_warning = $conf->supplier_proposal->facturation->warning_delay;
 	            $statut = self::STATUS_SIGNED;
-	            $label = $langs->trans("SupplierProposalsToProcess");      // May be billed or ordered
+	            $label = $langs->trans("SupplierProposalsToProcess"); // May be billed or ordered
             }
 
 	        $response = new WorkboardResponse();
-	        $response->warning_delay = $delay_warning/60/60/24;
+	        $response->warning_delay = $delay_warning / 60 / 60 / 24;
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
-	        $response->img = img_object('',"propal");
+	        $response->img = img_object('', "propal");
 
             // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
                 if ($mode == 'opened')
@@ -2169,7 +2169,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -2184,14 +2184,14 @@ 
      */
     function initAsSpecimen()
     {
-        global $user,$langs,$conf;
+        global $user, $langs, $conf;
 
         // Load array of products prodids
         $num_prods = 0;
         $prodids = array();
         $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."product";
+        $sql .= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2206,52 +2206,52 @@ 
         }
 
         // Initialise parametres
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
-        $this->specimen=1;
+        $this->specimen = 1;
         $this->socid = 1;
         $this->date = time();
         $this->cond_reglement_id   = 1;
         $this->cond_reglement_code = 'RECEP';
         $this->mode_reglement_id   = 7;
         $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
+        $this->note_public = 'This is a comment (public)';
+        $this->note_private = 'This is a comment (private)';
         // Lines
         $nbp = 5;
         $xnbp = 0;
         while ($xnbp < $nbp)
         {
-            $line=new SupplierProposalLine($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=19.6;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
+            $line = new SupplierProposalLine($this->db);
+            $line->desc = $langs->trans("Description")." ".$xnbp;
+            $line->qty = 1;
+            $line->subprice = 100;
+            $line->price = 100;
+            $line->tva_tx = 19.6;
+            $line->localtax1_tx = 0;
+            $line->localtax2_tx = 0;
             if ($xnbp == 2)
             {
-                $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
-                $line->remise_percent=50;
+                $line->total_ht = 50;
+                $line->total_ttc = 59.8;
+                $line->total_tva = 9.8;
+                $line->remise_percent = 50;
             }
             else
             {
-                $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
-                $line->remise_percent=00;
+                $line->total_ht = 100;
+                $line->total_ttc = 119.6;
+                $line->total_tva = 19.6;
+                $line->remise_percent = 00;
             }
 
             if ($num_prods > 0)
             {
             	$prodid = mt_rand(1, $num_prods);
-            	$line->fk_product=$prodids[$prodid];
+            	$line->fk_product = $prodids[$prodid];
             }
 
-            $this->lines[$xnbp]=$line;
+            $this->lines[$xnbp] = $line;
 
             $this->total_ht       += $line->total_ht;
             $this->total_tva      += $line->total_tva;
@@ -2270,27 +2270,27 @@ 
     {
         global $conf, $user;
 
-        $this->nb=array();
+        $this->nb = array();
         $clause = "WHERE";
 
         $sql = "SELECT count(p.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." p.entity = ".$conf->entity;
+        $sql .= " ".$clause." p.entity = ".$conf->entity;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $this->nb["askprice"]=$obj->nb;
+                $this->nb["askprice"] = $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -2298,7 +2298,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -2316,9 +2316,9 @@ 
         global $conf, $db, $langs;
         $langs->load("supplier_proposal");
 
-        if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
+        if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
         {
-        	$mybool=false;
+        	$mybool = false;
 
             $file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
             $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
@@ -2330,18 +2330,18 @@ 
                 $dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
 
                 // Load file with numbering class (if found)
-                $mybool|=@include_once $dir.$file;
+                $mybool |= @include_once $dir.$file;
             }
 
-            if (! $mybool)
+            if (!$mybool)
             {
-            	dol_print_error('',"Failed to include file ".$file);
+            	dol_print_error('', "Failed to include file ".$file);
             	return '';
             }
 
             $obj = new $classname();
             $numref = "";
-            $numref = $obj->getNextValue($soc,$this);
+            $numref = $obj->getNextValue($soc, $this);
 
             if ($numref != "")
             {
@@ -2349,7 +2349,7 @@ 
             }
             else
 			{
-                $this->error=$obj->error;
+                $this->error = $obj->error;
                 return "";
             }
         }
@@ -2371,65 +2371,65 @@ 
      *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return     string          					String with URL
      */
-    function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
+    function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1)
     {
         global $langs, $conf, $user;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-        $url='';
-        $result='';
-
-        $label='<u>'.$langs->trans("ShowSupplierProposal").'</u>';
-        if (! empty($this->ref))
-        $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (! empty($this->ref_fourn))
-            $label.= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+        $url = '';
+        $result = '';
+
+        $label = '<u>'.$langs->trans("ShowSupplierProposal").'</u>';
+        if (!empty($this->ref))
+        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->ref_fourn))
+            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
+        if (!empty($this->total_ht))
+            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_tva))
+            $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_ttc))
+            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
         if ($option == '') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id. $get_params;
+            $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
         }
         if ($option == 'document') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params;
+            $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id.$get_params;
         }
 
         if ($option !== 'nolink')
         {
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip) && $user->rights->propal->lire)
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowSupplierProposal");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowSupplierProposal");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        $picto='supplier_proposal';
+        $picto = 'supplier_proposal';
 
 
         if ($withpicto)
-            $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+            $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
         if ($withpicto && $withpicto != 2)
-            $result.=' ';
-        $result.=$linkstart.$this->ref.$linkend;
+            $result .= ' ';
+        $result .= $linkstart.$this->ref.$linkend;
         return $result;
     }
 
@@ -2443,16 +2443,16 @@ 
         // For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
 
         $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-        $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
-        $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
-        $sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
-        $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
-        $sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn,';
-		$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-        $sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
-        $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
+        $sql .= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
+        $sql .= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
+        $sql .= ' pt.product_type, pt.rang, pt.fk_parent_line,';
+        $sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
+        $sql .= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn,';
+		$sql .= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+        $sql .= ' WHERE pt.fk_supplier_proposal = '.$this->id;
+        $sql .= ' ORDER BY pt.rang ASC, pt.rowid';
 
         dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2465,45 +2465,45 @@ 
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->lines[$i]					= new SupplierProposalLine($this->db);
-                $this->lines[$i]->id				= $obj->rowid; // for backward compatibility
+                $this->lines[$i] = new SupplierProposalLine($this->db);
+                $this->lines[$i]->id = $obj->rowid; // for backward compatibility
                 $this->lines[$i]->rowid				= $obj->rowid;
                 $this->lines[$i]->label 			= $obj->custom_label;
-                $this->lines[$i]->description 		= $obj->description;
-                $this->lines[$i]->fk_product		= $obj->fk_product;
-                $this->lines[$i]->ref				= $obj->ref;
-                $this->lines[$i]->product_label		= $obj->product_label;
+                $this->lines[$i]->description = $obj->description;
+                $this->lines[$i]->fk_product = $obj->fk_product;
+                $this->lines[$i]->ref = $obj->ref;
+                $this->lines[$i]->product_label = $obj->product_label;
                 $this->lines[$i]->product_desc		= $obj->product_desc;
-                $this->lines[$i]->fk_product_type	= $obj->fk_product_type;  // deprecated
+                $this->lines[$i]->fk_product_type = $obj->fk_product_type; // deprecated
                 $this->lines[$i]->product_type		= $obj->product_type;
-                $this->lines[$i]->qty				= $obj->qty;
-                $this->lines[$i]->subprice			= $obj->subprice;
-                $this->lines[$i]->fk_remise_except 	= $obj->fk_remise_except;
-                $this->lines[$i]->remise_percent	= $obj->remise_percent;
-                $this->lines[$i]->tva_tx			= $obj->tva_tx;
+                $this->lines[$i]->qty = $obj->qty;
+                $this->lines[$i]->subprice = $obj->subprice;
+                $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
+                $this->lines[$i]->remise_percent = $obj->remise_percent;
+                $this->lines[$i]->tva_tx = $obj->tva_tx;
                 $this->lines[$i]->info_bits			= $obj->info_bits;
-                $this->lines[$i]->total_ht			= $obj->total_ht;
+                $this->lines[$i]->total_ht = $obj->total_ht;
                 $this->lines[$i]->total_tva			= $obj->total_tva;
                 $this->lines[$i]->total_ttc			= $obj->total_ttc;
-				$this->lines[$i]->fk_fournprice		= $obj->fk_fournprice;
-				$marginInfos						= getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
-				$this->lines[$i]->pa_ht				= $marginInfos[0];
-				$this->lines[$i]->marge_tx			= $marginInfos[1];
-				$this->lines[$i]->marque_tx			= $marginInfos[2];
-				$this->lines[$i]->fk_parent_line	= $obj->fk_parent_line;
-                $this->lines[$i]->special_code		= $obj->special_code;
-                $this->lines[$i]->rang				= $obj->rang;
+				$this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
+				$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
+				$this->lines[$i]->pa_ht = $marginInfos[0];
+				$this->lines[$i]->marge_tx = $marginInfos[1];
+				$this->lines[$i]->marque_tx = $marginInfos[2];
+				$this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
+                $this->lines[$i]->special_code = $obj->special_code;
+                $this->lines[$i]->rang = $obj->rang;
 
-                $this->lines[$i]->ref_fourn				= $obj->ref_produit_fourn;
+                $this->lines[$i]->ref_fourn = $obj->ref_produit_fourn;
 
 				// Multicurrency
-				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
-				$this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
+				$this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
+				$this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
 				$this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
 				$this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-				$this->lines[$i]->fk_unit				 	= $obj->fk_unit;
+				$this->lines[$i]->fk_unit = $obj->fk_unit;
 
                 $i++;
             }
@@ -2513,7 +2513,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -2528,19 +2528,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		global $conf, $langs;
 
 		$langs->load("supplier_proposal");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'aurore';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
+			} elseif (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
 				$modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
 			}
 		}
@@ -2579,8 +2579,8 @@ 
     var $db;
     var $error;
 
-    public $element='supplier_proposaldet';
-    public $table_element='supplier_proposaldet';
+    public $element = 'supplier_proposaldet';
+    public $table_element = 'supplier_proposaldet';
 
     var $oldline;
 
@@ -2589,8 +2589,8 @@ 
     var $id;
     var $fk_supplier_proposal;
     var $fk_parent_line;
-    var $desc;          	// Description ligne
-    var $fk_product;		// Id produit predefini
+    var $desc; // Description ligne
+    var $fk_product; // Id produit predefini
 	/**
 	 * @deprecated
 	 * @see product_type
@@ -2616,18 +2616,18 @@ 
 	var $marge_tx;
 	var $marque_tx;
 
-    var $special_code;	// Tag for special lines (exlusive tags)
+    var $special_code; // Tag for special lines (exlusive tags)
     // 1: frais de port
     // 2: ecotaxe
     // 3: option line (when qty = 0)
 
-    var $info_bits = 0;	// Liste d'options cumulables:
+    var $info_bits = 0; // Liste d'options cumulables:
     // Bit 0: 	0 si TVA normal - 1 si TVA NPR
     // Bit 1:	0 ligne normale - 1 si ligne de remise fixe
 
-    var $total_ht;			// Total HT  de la ligne toute quantite et incluant la remise ligne
-    var $total_tva;			// Total TVA  de la ligne toute quantite et incluant la remise ligne
-    var $total_ttc;			// Total TTC de la ligne toute quantite et incluant la remise ligne
+    var $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
+    var $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
+    var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
 
 	/**
 	 * @deprecated
@@ -2667,12 +2667,12 @@ 
 	 */
 	public $product_desc;
 
-    var $localtax1_tx;		// Local tax 1
-    var $localtax2_tx;		// Local tax 2
-    var $localtax1_type;	// Local tax 1 type
-	var $localtax2_type;	// Local tax 2 type
-    var $total_localtax1;  	// Line total local tax 1
-    var $total_localtax2;	// Line total local tax 2
+    var $localtax1_tx; // Local tax 1
+    var $localtax2_tx; // Local tax 2
+    var $localtax1_type; // Local tax 1 type
+	var $localtax2_type; // Local tax 2 type
+    var $total_localtax1; // Line total local tax 1
+    var $total_localtax2; // Line total local tax 2
 
     var $skip_update_total; // Skip update price total for special lines
 
@@ -2693,7 +2693,7 @@ 
      */
     function __construct($db)
     {
-        $this->db= $db;
+        $this->db = $db;
     }
 
     /**
@@ -2705,42 +2705,42 @@ 
 	function fetch($rowid)
 	{
 		$sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
-		$sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
-		$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
-		$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
-		$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
-		$sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
-		$sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
-		$sql.= ' WHERE pd.rowid = '.$rowid;
+		$sql .= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
+		$sql .= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
+		$sql .= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
+		$sql .= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
+		$sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
+		$sql .= ' WHERE pd.rowid = '.$rowid;
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$objp = $this->db->fetch_object($result);
 
-			$this->rowid			= $objp->rowid; // deprecated
-			$this->id				= $objp->rowid;
-			$this->fk_supplier_proposal		= $objp->fk_supplier_proposal;
-			$this->fk_parent_line	= $objp->fk_parent_line;
+			$this->rowid = $objp->rowid; // deprecated
+			$this->id = $objp->rowid;
+			$this->fk_supplier_proposal = $objp->fk_supplier_proposal;
+			$this->fk_parent_line = $objp->fk_parent_line;
 			$this->label			= $objp->custom_label;
 			$this->desc				= $objp->description;
-			$this->qty				= $objp->qty;
-			$this->price			= $objp->price;		// deprecated
-			$this->subprice			= $objp->subprice;
+			$this->qty = $objp->qty;
+			$this->price			= $objp->price; // deprecated
+			$this->subprice = $objp->subprice;
 			$this->tva_tx			= $objp->tva_tx;
 			$this->remise			= $objp->remise;
-			$this->remise_percent	= $objp->remise_percent;
+			$this->remise_percent = $objp->remise_percent;
 			$this->fk_remise_except = $objp->fk_remise_except;
-			$this->fk_product		= $objp->fk_product;
+			$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_ttc		= $objp->total_ttc;
 
-			$this->fk_fournprice	= $objp->fk_fournprice;
+			$this->fk_fournprice = $objp->fk_fournprice;
 
 			$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
 			$this->pa_ht			= $marginInfos[0];
@@ -2749,24 +2749,24 @@ 
 
 			$this->special_code		= $objp->special_code;
 			$this->product_type		= $objp->product_type;
-			$this->rang				= $objp->rang;
+			$this->rang = $objp->rang;
 
-			$this->ref				= $objp->product_ref;      // deprecated
-			$this->product_ref		= $objp->product_ref;
-			$this->libelle			= $objp->product_label;  // deprecated
+			$this->ref = $objp->product_ref; // deprecated
+			$this->product_ref = $objp->product_ref;
+			$this->libelle = $objp->product_label; // deprecated
 			$this->product_label	= $objp->product_label;
 			$this->product_desc		= $objp->product_desc;
 
-			$this->ref_fourn		= $objp->ref_produit_forun;
+			$this->ref_fourn = $objp->ref_produit_forun;
 
 			// Multicurrency
-			$this->fk_multicurrency 		= $objp->fk_multicurrency;
-			$this->multicurrency_code 		= $objp->multicurrency_code;
+			$this->fk_multicurrency = $objp->fk_multicurrency;
+			$this->multicurrency_code = $objp->multicurrency_code;
 			$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->fk_unit				 	= $objp->fk_unit;
+			$this->fk_unit = $objp->fk_unit;
 
 			$this->db->free($result);
 		}
@@ -2782,33 +2782,33 @@ 
      *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-    function insert($notrigger=0)
+    function insert($notrigger = 0)
     {
-        global $conf,$langs,$user;
+        global $conf, $langs, $user;
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type=0;
-		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
-
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->localtax1_type)) $this->localtax1_type = 0;
+		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+        if (empty($this->rang)) $this->rang = 0;
+        if (empty($this->remise)) $this->remise = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
+        if (empty($this->fk_unit)) $this->fk_unit = 0;
+        if (empty($this->subprice)) $this->subprice = 0;
+
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2830,68 +2830,68 @@ 
 
         // Insert line into database
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
-        $sql.= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
-		$sql.= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' subprice, remise_percent, ';
-        $sql.= ' info_bits, ';
-        $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
-        $sql.= ' ref_fourn,';
-		$sql.= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
-        $sql.= " VALUES (".$this->fk_supplier_proposal.",";
-        $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
-        $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->desc)."',";
-        $sql.= " ".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->product_type)."',";
-        $sql.= " ".($this->fk_remise_except?"'".$this->db->escape($this->fk_remise_except)."'":"null").",";
-        $sql.= " ".price2num($this->qty).",";
-        $sql.= " ".price2num($this->tva_tx).",";
-        $sql.= " ".price2num($this->localtax1_tx).",";
-        $sql.= " ".price2num($this->localtax2_tx).",";
-		$sql.= " '".$this->db->escape($this->localtax1_type)."',";
-		$sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= " ".(!empty($this->subprice)?price2num($this->subprice):"null").",";
-        $sql.= " ".price2num($this->remise_percent).",";
-        $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").",";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").",";
-        $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
-        $sql.= ' '.$this->special_code.',';
-        $sql.= ' '.$this->rang.',';
-        $sql.= " '".$this->db->escape($this->ref_fourn)."'";
-		$sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".$this->multicurrency_subprice;
-		$sql.= ", ".$this->multicurrency_total_ht;
-		$sql.= ", ".$this->multicurrency_total_tva;
-		$sql.= ", ".$this->multicurrency_total_ttc;
-        $sql.= ", ".($this->fk_unit?$this->fk_unit:'null');
-		$sql.= ')';
+        $sql .= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
+		$sql .= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+        $sql .= ' subprice, remise_percent, ';
+        $sql .= ' info_bits, ';
+        $sql .= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
+        $sql .= ' ref_fourn,';
+		$sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
+        $sql .= " VALUES (".$this->fk_supplier_proposal.",";
+        $sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+        $sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->desc)."',";
+        $sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->product_type)."',";
+        $sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
+        $sql .= " ".price2num($this->qty).",";
+        $sql .= " ".price2num($this->tva_tx).",";
+        $sql .= " ".price2num($this->localtax1_tx).",";
+        $sql .= " ".price2num($this->localtax2_tx).",";
+		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
+        $sql .= " ".(!empty($this->subprice) ?price2num($this->subprice) : "null").",";
+        $sql .= " ".price2num($this->remise_percent).",";
+        $sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
+        $sql .= " ".price2num($this->total_ht).",";
+        $sql .= " ".price2num($this->total_tva).",";
+        $sql .= " ".price2num($this->total_localtax1).",";
+        $sql .= " ".price2num($this->total_localtax2).",";
+        $sql .= " ".price2num($this->total_ttc).",";
+        $sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
+        $sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
+        $sql .= ' '.$this->special_code.',';
+        $sql .= ' '.$this->rang.',';
+        $sql .= " '".$this->db->escape($this->ref_fourn)."'";
+		$sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".$this->multicurrency_subprice;
+		$sql .= ", ".$this->multicurrency_total_ht;
+		$sql .= ", ".$this->multicurrency_total_tva;
+		$sql .= ", ".$this->multicurrency_total_ttc;
+        $sql .= ", ".($this->fk_unit ? $this->fk_unit : 'null');
+		$sql .= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
-			$this->id=$this->rowid;
+            $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
+			$this->id = $this->rowid;
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-            	$result=$this->insertExtraFields();
+            	$result = $this->insertExtraFields();
             	if ($result < 0)
             	{
             		$error++;
             	}
             }
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT',$user);
+                $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -2905,7 +2905,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -2918,21 +2918,21 @@ 
      */
     function delete()
     {
-        global $conf,$langs,$user;
+        global $conf, $langs, $user;
 
-        $error=0;
+        $error = 0;
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->rowid;
         dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
-        if ($this->db->query($sql) )
+        if ($this->db->query($sql))
         {
 
         	// Remove extrafields
-        	if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        	if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
         	{
-        		$this->id=$this->rowid;
-        		$result=$this->deleteExtraFields();
+        		$this->id = $this->rowid;
+        		$result = $this->deleteExtraFields();
         		if ($result < 0)
         		{
         			$error++;
@@ -2941,7 +2941,7 @@ 
         	}
 
             // Call trigger
-            $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE',$user);
+            $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE', $user);
             if ($result < 0)
             {
                 $this->db->rollback();
@@ -2955,7 +2955,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -2967,33 +2967,33 @@ 
      *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return	int					<0 if ko, >0 if ok
      */
-    function update($notrigger=0)
+    function update($notrigger = 0)
     {
-        global $conf,$langs,$user;
+        global $conf, $langs, $user;
 
-        $error=0;
+        $error = 0;
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-		if (empty($this->localtax1_type)) $this->localtax1_type=0;
-		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->marque_tx)) $this->marque_tx=0;
-        if (empty($this->marge_tx)) $this->marge_tx=0;
-        if (empty($this->price)) $this->price=0;	// TODO A virer
-        if (empty($this->remise)) $this->remise=0;	// TODO A virer
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
-
-		if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
+		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
+        if (empty($this->marque_tx)) $this->marque_tx = 0;
+        if (empty($this->marge_tx)) $this->marge_tx = 0;
+        if (empty($this->price)) $this->price = 0; // TODO A virer
+        if (empty($this->remise)) $this->remise = 0; // TODO A virer
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
+        if (empty($this->fk_unit)) $this->fk_unit = 0;
+        if (empty($this->subprice)) $this->subprice = 0;
+
+		if (empty($this->pa_ht)) $this->pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -3012,62 +3012,62 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql.= " description='".$this->db->escape($this->desc)."'";
-        $sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-        $sql.= " , product_type=".$this->product_type;
-        $sql.= " , tva_tx='".price2num($this->tva_tx)."'";
-        $sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
-        $sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
-		$sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-		$sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql.= " , qty='".price2num($this->qty)."'";
-        $sql.= " , subprice=".price2num($this->subprice)."";
-        $sql.= " , remise_percent=".price2num($this->remise_percent)."";
-        $sql.= " , price=".price2num($this->price)."";					// TODO A virer
-        $sql.= " , remise=".price2num($this->remise)."";				// TODO A virer
-        $sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
+        $sql .= " description='".$this->db->escape($this->desc)."'";
+        $sql .= " , label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+        $sql .= " , product_type=".$this->product_type;
+        $sql .= " , tva_tx='".price2num($this->tva_tx)."'";
+        $sql .= " , localtax1_tx=".price2num($this->localtax1_tx);
+        $sql .= " , localtax2_tx=".price2num($this->localtax2_tx);
+		$sql .= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql .= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+        $sql .= " , qty='".price2num($this->qty)."'";
+        $sql .= " , subprice=".price2num($this->subprice)."";
+        $sql .= " , remise_percent=".price2num($this->remise_percent)."";
+        $sql .= " , price=".price2num($this->price).""; // TODO A virer
+        $sql .= " , remise=".price2num($this->remise).""; // TODO A virer
+        $sql .= " , info_bits='".$this->db->escape($this->info_bits)."'";
         if (empty($this->skip_update_total))
         {
-            $sql.= " , total_ht=".price2num($this->total_ht)."";
-            $sql.= " , total_tva=".price2num($this->total_tva)."";
-            $sql.= " , total_ttc=".price2num($this->total_ttc)."";
-            $sql.= " , total_localtax1=".price2num($this->total_localtax1)."";
-            $sql.= " , total_localtax2=".price2num($this->total_localtax2)."";
+            $sql .= " , total_ht=".price2num($this->total_ht)."";
+            $sql .= " , total_tva=".price2num($this->total_tva)."";
+            $sql .= " , total_ttc=".price2num($this->total_ttc)."";
+            $sql .= " , total_localtax1=".price2num($this->total_localtax1)."";
+            $sql .= " , total_localtax2=".price2num($this->total_localtax2)."";
         }
-		$sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null");
-		$sql.= " , buy_price_ht=".price2num($this->pa_ht);
-        if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
-        $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
-        if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
-        $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
-        $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
+		$sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
+		$sql .= " , buy_price_ht=".price2num($this->pa_ht);
+        if (strlen($this->special_code)) $sql .= " , special_code=".$this->special_code;
+        $sql .= " , fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
+        if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+        $sql .= " , ref_fourn=".(!empty($this->ref_fourn) ? "'".$this->db->escape($this->ref_fourn)."'" : "null");
+        $sql .= " , fk_unit=".($this->fk_unit ? $this->fk_unit : 'null');
 
 		// Multicurrency
-		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql.= " WHERE rowid = ".$this->rowid;
+		$sql .= " WHERE rowid = ".$this->rowid;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
-        		$this->id=$this->rowid;
-        		$result=$this->insertExtraFields();
+        		$this->id = $this->rowid;
+        		$result = $this->insertExtraFields();
         		if ($result < 0)
         		{
         			$error++;
         		}
         	}
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE',$user);
+                $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -3081,7 +3081,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -3099,14 +3099,14 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql.= " total_ht=".price2num($this->total_ht,'MT')."";
-        $sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
-        $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
-        $sql.= " WHERE rowid = ".$this->rowid;
+        $sql .= " total_ht=".price2num($this->total_ht, 'MT')."";
+        $sql .= ",total_tva=".price2num($this->total_tva, 'MT')."";
+        $sql .= ",total_ttc=".price2num($this->total_ttc, 'MT')."";
+        $sql .= " WHERE rowid = ".$this->rowid;
 
         dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -3114,7 +3114,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }

Braces +377 added lines, -218 removed lines

@@ -213,7 +213,9 @@ 
     {
         global $conf, $mysoc;
 
-        if (! $qty) $qty = 1;
+        if (! $qty) {
+        	$qty = 1;
+        }
 
         dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
         if ($idproduct > 0)
@@ -225,7 +227,9 @@ 
 
             $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
-            if (empty($tva_tx)) $tva_npr=0;
+            if (empty($tva_tx)) {
+            	$tva_npr=0;
+            }
             $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
             $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
 
@@ -233,8 +237,7 @@ 
             if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else
+            } else
             {
                 $price = $prod->price;
             }
@@ -272,9 +275,11 @@ 
 
         if ($result > 0)
         {
-            if ($remise->fk_facture)	// Protection against multiple submission
+            if ($remise->fk_facture) {
+            	// Protection against multiple submission
             {
                 $this->error=$langs->trans("ErrorDiscountAlreadyUsed");
+            }
                 $this->db->rollback();
                 return -5;
             }
@@ -307,21 +312,18 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$supplier_proposalligne->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -2;
@@ -370,11 +372,21 @@ 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+        if (empty($remise_percent)) {
+        	$remise_percent=0;
+        }
+        if (empty($qty)) {
+        	$qty=0;
+        }
+        if (empty($info_bits)) {
+        	$info_bits=0;
+        }
+        if (empty($rang)) {
+        	$rang=0;
+        }
+        if (empty($fk_parent_line) || $fk_parent_line < 0) {
+        	$fk_parent_line=0;
+        }
 
         $remise_percent=price2num($remise_percent);
         $qty=price2num($qty);
@@ -387,14 +399,15 @@ 
         if ($price_base_type=='HT')
         {
             $pu=$pu_ht;
-        }
-        else
+        } else
         {
             $pu=$pu_ttc;
         }
 
         // Check parameters
-        if ($type < 0) return -1;
+        if ($type < 0) {
+        	return -1;
+        }
 
         if ($this->statut == 0)
         {
@@ -489,7 +502,9 @@ 
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
             // Mise en option de la ligne
-            if (empty($qty) && empty($special_code)) $this->line->special_code=3;
+            if (empty($qty) && empty($special_code)) {
+            	$this->line->special_code=3;
+            }
 
             // TODO deprecated
             $this->line->price=$price;
@@ -503,7 +518,9 @@ 
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+                if (! empty($fk_parent_line)) {
+                	$this->line_order(true,'DESC');
+                }
 
                 // Mise a jour informations denormalisees au niveau de la propale meme
                 $result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -511,15 +528,13 @@ 
                 {
                     $this->db->commit();
                     return $this->line->rowid;
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$this->line->error;
                 $this->db->rollback();
@@ -569,8 +584,14 @@ 
         $txlocaltax1=price2num($txlocaltax1);
         $txlocaltax2=price2num($txlocaltax2);
     	$pa_ht=price2num($pa_ht);
-        if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
-        if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
+        if (empty($qty) && empty($special_code)) {
+        	$special_code=3;
+        }
+        // Set option tag
+        if (! empty($qty) && $special_code == 3) {
+        	$special_code=0;
+        }
+        // Remove option tag
 
         if ($this->statut == 0)
         {
@@ -673,7 +694,9 @@ 
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+                if (! empty($fk_parent_line)) {
+                	$this->line_order(true,'DESC');
+                }
 
                 $this->update_price(1);
 
@@ -682,15 +705,13 @@ 
 
                 $this->db->commit();
                 return $result;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
             return -2;
@@ -718,13 +739,11 @@ 
                 $this->update_price(1);
 
                 return 1;
-            }
-            else
+            } else
             {
                 return -1;
             }
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -758,9 +777,12 @@ 
         }
 
         // Check parameters
-		if (! empty($this->ref))	// We check that ref is not already used
+		if (! empty($this->ref)) {
+			// We check that ref is not already used
 		{
-			$result=self::isExistingObject($this->element, 0, $this->ref);	// Check ref is not yet used
+			$result=self::isExistingObject($this->element, 0, $this->ref);
+		}
+		// Check ref is not yet used
 			if ($result > 0)
 			{
 				$this->error='ErrorRefAlreadyExists';
@@ -771,7 +793,9 @@ 
 		}
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -846,7 +870,9 @@ 
 
                 dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql=$this->db->query($sql);
-                if (! $resql) $error++;
+                if (! $resql) {
+                	$error++;
+                }
 
                 /*
                  *  Insertion du detail des produits dans la base
@@ -907,7 +933,9 @@ 
                 if (! $error && $this->origin && $this->origin_id)
                 {
                     $ret = $this->add_object_linked();
-                    if (! $ret)	dol_print_error($this->db);
+                    if (! $ret) {
+                    	dol_print_error($this->db);
+                    }
                 }
 
                 if (! $error)
@@ -924,16 +952,19 @@ 
                     	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                     	if (empty($reshook))
                     	{
-                    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+                    			// For avoid conflicts if trigger used
                     		{
                     			$result=$this->insertExtraFields();
+                    		}
                     			if ($result < 0)
                     			{
                     				$error++;
                     			}
                     		}
+                    	} else if ($reshook < 0) {
+                    		$error++;
                     	}
-                    	else if ($reshook < 0) $error++;
 
                         if (! $notrigger)
                         {
@@ -942,15 +973,13 @@ 
                             if ($result < 0) { $error++; }
                             // End call triggers
                         }
-                    }
-                    else
+                    } else
 					{
                         $this->error=$this->db->lasterror();
                         $error++;
                     }
                 }
-            }
-            else
+            } else
 			{
                 $this->error=$this->db->lasterror();
                 $error++;
@@ -961,14 +990,12 @@ 
                 $this->db->commit();
                 dol_syslog(get_class($this)."::create done id=".$this->id);
                 return $this->id;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -1007,8 +1034,9 @@ 
         $this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+		foreach($this->lines as $line) {
+					$line->fetch_optionals($line->rowid);
+		}
 
 		// Load source object
 		$objFrom = clone $this;
@@ -1027,8 +1055,7 @@ 
             }
 
             // TODO Change product price if multi-prices
-        }
-        else
+        } else
         {
             $objsoc->fetch($this->socid);
         }
@@ -1055,7 +1082,9 @@ 
 
         // Create clone
         $result=$this->create($user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+        	$error++;
+        }
 
         if (! $error)
         {
@@ -1065,7 +1094,9 @@ 
                 $parameters=array('objFrom'=>$objFrom);
                 $action='';
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
+                if ($reshook < 0) {
+                	$error++;
+                }
             }
 
             // Call trigger
@@ -1079,8 +1110,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1120,8 +1150,11 @@ 
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term').')';
         $sql.= " WHERE p.fk_statut = c.id";
         $sql.= " AND p.entity = ".$conf->entity;
-        if ($ref) $sql.= " AND p.ref='".$ref."'";
-        else $sql.= " AND p.rowid=".$rowid;
+        if ($ref) {
+        	$sql.= " AND p.ref='".$ref."'";
+        } else {
+        	$sql.= " AND p.rowid=".$rowid;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -1277,8 +1310,7 @@ 
                         $i++;
                     }
                     $this->db->free($result);
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->error();
                     return -1;
@@ -1296,8 +1328,7 @@ 
 
             $this->error="Record Not Found";
             return 0;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -1320,22 +1351,24 @@ 
     	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
     	if (empty($reshook))
     	{
-    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+    			// For avoid conflicts if trigger used
     		{
     			$result=$this->insertExtraFields();
+    		}
     			if ($result < 0)
     			{
     				$error++;
     			}
     		}
+    	} else if ($reshook < 0) {
+    		$error++;
     	}
-    	else if ($reshook < 0) $error++;
 
 		if (!$error)
 	    {
 	    	return 1;
-	    }
-	    else
+	    } else
 	    {
 	    	return -1;
 	    }
@@ -1368,11 +1401,12 @@ 
             $soc->fetch($this->socid);
 
             // Define new ref
-            if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+            if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+            	// empty should not happened, but when it occurs, the test save life
             {
             	$num = $this->getNextNumRef($soc);
             }
-            else
+            } else
             {
             	$num = $this->ref;
             }
@@ -1442,8 +1476,7 @@ 
 
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
 			{
             	$this->db->rollback();
             	return -1;
@@ -1470,8 +1503,7 @@ 
             {
                 $this->date_livraison = $date_livraison;
                 return 1;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
                 dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
@@ -1503,8 +1535,7 @@ 
                 $this->remise_percent = $remise;
                 $this->update_price(1);
                 return 1;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
                 return -1;
@@ -1537,8 +1568,7 @@ 
                 $this->remise_absolue = $remise;
                 $this->update_price(1);
                 return 1;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
                 return -1;
@@ -1566,7 +1596,9 @@ 
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
         $sql.= " SET fk_statut = ".$this->statut.",";
-		if (! empty($note)) $sql.= " note_private = '".$this->db->escape($note)."',";
+		if (! empty($note)) {
+			$sql.= " note_private = '".$this->db->escape($note)."',";
+		}
         $sql.= " date_cloture=NULL, fk_user_cloture=NULL";
         $sql.= " WHERE rowid = ".$this->id;
 
@@ -1601,8 +1633,7 @@ 
 		    }
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -1643,10 +1674,12 @@ 
             	$trigger_name='SUPPLIER_PROPOSAL_CLOSE_SIGNED';
 				$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
 
-                if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
+                if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) {
+                	// TODO This option was not tested correctly. Error if product ref does not exists
                 {
                     $result = $this->updateOrCreatePriceFournisseur($user);
                 }
+                }
 
             }
             if ($statut == 4)
@@ -1677,14 +1710,12 @@ 
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->errors[]=$this->db->lasterror();
@@ -1706,7 +1737,9 @@ 
 		dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
 		foreach ($this->lines as $product)
 		{
-			if ($product->subprice <= 0) continue;
+			if ($product->subprice <= 0) {
+				continue;
+			}
 
 			$idProductFourn = $productsupplier->find_min_price_product_fournisseur($product->fk_product, $product->qty);
 			$res = $productsupplier->fetch($idProductFourn);
@@ -1801,8 +1834,7 @@ 
             $this->statut = 0;
             $this->brouillon = 1;
             return 1;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -1831,19 +1863,31 @@ 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
         $sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
         $sql.= " p.datep as dp, p.fin_validite as datelimite";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
+        if (! $user->rights->societe->client->voir && ! $socid) {
+        	$sql .= ", sc.fk_soc, sc.fk_user";
+        }
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (! $user->rights->societe->client->voir && ! $socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
         $sql.= " WHERE p.entity = ".$conf->entity;
         $sql.= " AND p.fk_soc = s.rowid";
         $sql.= " AND p.fk_statut = c.id";
-        if (! $user->rights->societe->client->voir && ! $socid) //restriction
+        if (! $user->rights->societe->client->voir && ! $socid) {
+        	//restriction
         {
         	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
         }
-        if ($socid) $sql.= " AND s.rowid = ".$socid;
-        if ($draft)	$sql.= " AND p.fk_statut = 0";
-        if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
+        }
+        if ($socid) {
+        	$sql.= " AND s.rowid = ".$socid;
+        }
+        if ($draft) {
+        	$sql.= " AND p.fk_statut = 0";
+        }
+        if ($notcurrentuser > 0) {
+        	$sql.= " AND p.fk_user_author <> ".$user->id;
+        }
         $sql.= $this->db->order($sortfield,$sortorder);
         $sql.= $this->db->plimit($limit,$offset);
 
@@ -1861,12 +1905,10 @@ 
                     if ($shortlist == 1)
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
+                    } else if ($shortlist == 2)
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
+                    } else
 					{
                         $ga[$i]['id']	= $obj->supplier_proposalid;
                         $ga[$i]['ref'] 	= $obj->ref;
@@ -1877,8 +1919,7 @@ 
                 }
             }
             return $ga;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return -1;
@@ -1919,7 +1960,9 @@ 
                 {
                     // Delete linked object
                     $res = $this->deleteObjectLinked();
-                    if ($res < 0) $error++;
+                    if ($res < 0) {
+                    	$error++;
+                    }
 
                     if (! $error)
                     {
@@ -1933,9 +1976,11 @@ 
                             {
                                 dol_delete_preview($this);
 
-                                if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+                                if (! dol_delete_file($file,0,0,0,$this)) {
+                                	// For triggers
                                 {
                                     $this->error='ErrorFailToDeleteFile';
+                                }
                                     $this->errors=array('ErrorFailToDeleteFile');
                                 	$this->db->rollback();
                                     return 0;
@@ -1958,9 +2003,11 @@ 
                     // Removed extrafields
                     if (! $error)
                     {
-                    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+                    		// For avoid conflicts if trigger used
                     	{
                     		$result=$this->deleteExtraFields();
+                    	}
                     		if ($result < 0)
                     		{
                     			$error++;
@@ -1975,29 +2022,25 @@ 
                         dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
                         $this->db->commit();
                         return 1;
-                    }
-                    else
+                    } else
                     {
                         $this->error=$this->db->lasterror();
                         $this->db->rollback();
                         return 0;
                     }
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -3;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -2054,8 +2097,7 @@ 
             }
             $this->db->free($result);
 
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2085,19 +2127,43 @@ 
 		global $langs;
 		$langs->load("supplier_proposal");
 
-		if ($statut==0) $statuttrans='statut0';
-		if ($statut==1) $statuttrans='statut1';
-		if ($statut==2) $statuttrans='statut3';
-		if ($statut==3) $statuttrans='statut5';
-		if ($statut==4) $statuttrans='statut6';
-
-		if ($mode == 0)	return $this->labelstatut[$statut];
-		if ($mode == 1)	return $this->labelstatut_short[$statut];
-		if ($mode == 2)	return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
-		if ($mode == 3)	return img_picto($this->labelstatut[$statut], $statuttrans);
-		if ($mode == 4)	return img_picto($this->labelstatut[$statut],$statuttrans).' '.$this->labelstatut[$statut];
-		if ($mode == 5)	return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
-		if ($mode == 6)	return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
+		if ($statut==0) {
+			$statuttrans='statut0';
+		}
+		if ($statut==1) {
+			$statuttrans='statut1';
+		}
+		if ($statut==2) {
+			$statuttrans='statut3';
+		}
+		if ($statut==3) {
+			$statuttrans='statut5';
+		}
+		if ($statut==4) {
+			$statuttrans='statut6';
+		}
+
+		if ($mode == 0) {
+			return $this->labelstatut[$statut];
+		}
+		if ($mode == 1) {
+			return $this->labelstatut_short[$statut];
+		}
+		if ($mode == 2) {
+			return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
+		}
+		if ($mode == 3) {
+			return img_picto($this->labelstatut[$statut], $statuttrans);
+		}
+		if ($mode == 4) {
+			return img_picto($this->labelstatut[$statut],$statuttrans).' '.$this->labelstatut[$statut];
+		}
+		if ($mode == 5) {
+			return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
+		}
+		if ($mode == 6) {
+			return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut],$statuttrans);
+		}
 	}
 
 
@@ -2126,9 +2192,15 @@ 
             $clause = " AND";
         }
         $sql.= $clause." p.entity = ".$conf->entity;
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+        if ($mode == 'opened') {
+        	$sql.= " AND p.fk_statut = 1";
+        }
+        if ($mode == 'signed') {
+        	$sql.= " AND p.fk_statut = 2";
+        }
+        if ($user->societe_id) {
+        	$sql.= " AND p.fk_soc = ".$user->societe_id;
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2166,8 +2238,7 @@ 
                 // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
             }
             return $response;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;
@@ -2236,8 +2307,7 @@ 
                 $line->total_ttc=59.8;
                 $line->total_tva=9.8;
                 $line->remise_percent=50;
-            }
-            else
+            } else
             {
                 $line->total_ht=100;
                 $line->total_ttc=119.6;
@@ -2294,8 +2364,7 @@ 
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->lasterror();
@@ -2346,14 +2415,12 @@ 
             if ($numref != "")
             {
                 return $numref;
-            }
-            else
+            } else
 			{
                 $this->error=$obj->error;
                 return "";
             }
-        }
-        else
+        } else
 		{
             $langs->load("errors");
             print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
@@ -2375,22 +2442,30 @@ 
     {
         global $langs, $conf, $user;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (! empty($conf->dol_no_mouse_hover)) {
+        	$notooltip=1;
+        }
+        // Force disable tooltips
 
         $url='';
         $result='';
 
         $label='<u>'.$langs->trans("ShowSupplierProposal").'</u>';
-        if (! empty($this->ref))
-        $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (! empty($this->ref_fourn))
-            $label.= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        if (! empty($this->ref)) {
+                $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        }
+        if (! empty($this->ref_fourn)) {
+                    $label.= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
+        }
+        if (! empty($this->total_ht)) {
+                    $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if (! empty($this->total_tva)) {
+                    $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if (! empty($this->total_ttc)) {
+                    $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        }
         if ($option == '') {
             $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id. $get_params;
         }
@@ -2402,8 +2477,12 @@ 
         {
         	// Add param to save lastsearch_values or not
         	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        		$add_save_lastsearch_values=1;
+        	}
+        	if ($add_save_lastsearch_values) {
+        		$url.='&save_lastsearch_values=1';
+        	}
         }
 
         $linkclose='';
@@ -2425,10 +2504,12 @@ 
         $picto='supplier_proposal';
 
 
-        if ($withpicto)
-            $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2)
-            $result.=' ';
+        if ($withpicto) {
+                    $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+                    $result.=' ';
+        }
         $result.=$linkstart.$this->ref.$linkend;
         return $result;
     }
@@ -2510,8 +2591,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -2769,8 +2849,7 @@ 
 			$this->fk_unit				 	= $objp->fk_unit;
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2791,24 +2870,58 @@ 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type=0;
-		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
-
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->tva_tx)) {
+        	$this->tva_tx=0;
+        }
+        if (empty($this->localtax1_tx)) {
+        	$this->localtax1_tx=0;
+        }
+        if (empty($this->localtax2_tx)) {
+        	$this->localtax2_tx=0;
+        }
+        if (empty($this->localtax1_type)) {
+        	$this->localtax1_type=0;
+        }
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type=0;
+		}
+        if (empty($this->total_localtax1)) {
+        	$this->total_localtax1=0;
+        }
+        if (empty($this->total_localtax2)) {
+        	$this->total_localtax2=0;
+        }
+        if (empty($this->rang)) {
+        	$this->rang=0;
+        }
+        if (empty($this->remise)) {
+        	$this->remise=0;
+        }
+        if (empty($this->remise_percent)) {
+        	$this->remise_percent=0;
+        }
+        if (empty($this->info_bits)) {
+        	$this->info_bits=0;
+        }
+        if (empty($this->special_code)) {
+        	$this->special_code=0;
+        }
+        if (empty($this->fk_parent_line)) {
+        	$this->fk_parent_line=0;
+        }
+        if (empty($this->fk_fournprice)) {
+        	$this->fk_fournprice=0;
+        }
+        if (empty($this->fk_unit)) {
+        	$this->fk_unit=0;
+        }
+        if (empty($this->subprice)) {
+        	$this->subprice=0;
+        }
+
+        if (empty($this->pa_ht)) {
+        	$this->pa_ht=0;
+        }
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2816,15 +2929,16 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
 		}
 
         // Check parameters
-        if ($this->product_type < 0) return -1;
+        if ($this->product_type < 0) {
+        	return -1;
+        }
 
         $this->db->begin();
 
@@ -2879,9 +2993,11 @@ 
             $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
 			$this->id=$this->rowid;
 
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            	// For avoid conflicts if trigger used
             {
             	$result=$this->insertExtraFields();
+            }
             	if ($result < 0)
             	{
             		$error++;
@@ -2902,8 +3018,7 @@ 
 
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error()." sql=".$sql;
             $this->db->rollback();
@@ -2929,9 +3044,11 @@ 
         {
 
         	// Remove extrafields
-        	if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        	if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+        		// For avoid conflicts if trigger used
         	{
         		$this->id=$this->rowid;
+        	}
         		$result=$this->deleteExtraFields();
         		if ($result < 0)
         		{
@@ -2952,8 +3069,7 @@ 
             $this->db->commit();
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error()." sql=".$sql;
             $this->db->rollback();
@@ -2974,26 +3090,66 @@ 
         $error=0;
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-		if (empty($this->localtax1_type)) $this->localtax1_type=0;
-		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->marque_tx)) $this->marque_tx=0;
-        if (empty($this->marge_tx)) $this->marge_tx=0;
-        if (empty($this->price)) $this->price=0;	// TODO A virer
-        if (empty($this->remise)) $this->remise=0;	// TODO A virer
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
-
-		if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->tva_tx)) {
+        	$this->tva_tx=0;
+        }
+        if (empty($this->localtax1_tx)) {
+        	$this->localtax1_tx=0;
+        }
+        if (empty($this->localtax2_tx)) {
+        	$this->localtax2_tx=0;
+        }
+        if (empty($this->total_localtax1)) {
+        	$this->total_localtax1=0;
+        }
+        if (empty($this->total_localtax2)) {
+        	$this->total_localtax2=0;
+        }
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type=0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type=0;
+		}
+        if (empty($this->marque_tx)) {
+        	$this->marque_tx=0;
+        }
+        if (empty($this->marge_tx)) {
+        	$this->marge_tx=0;
+        }
+        if (empty($this->price)) {
+        	$this->price=0;
+        }
+        // TODO A virer
+        if (empty($this->remise)) {
+        	$this->remise=0;
+        }
+        // TODO A virer
+        if (empty($this->remise_percent)) {
+        	$this->remise_percent=0;
+        }
+        if (empty($this->info_bits)) {
+        	$this->info_bits=0;
+        }
+        if (empty($this->special_code)) {
+        	$this->special_code=0;
+        }
+        if (empty($this->fk_parent_line)) {
+        	$this->fk_parent_line=0;
+        }
+        if (empty($this->fk_fournprice)) {
+        	$this->fk_fournprice=0;
+        }
+        if (empty($this->fk_unit)) {
+        	$this->fk_unit=0;
+        }
+        if (empty($this->subprice)) {
+        	$this->subprice=0;
+        }
+
+		if (empty($this->pa_ht)) {
+			$this->pa_ht=0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -3001,8 +3157,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -3036,9 +3191,13 @@ 
         }
 		$sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null");
 		$sql.= " , buy_price_ht=".price2num($this->pa_ht);
-        if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
+        if (strlen($this->special_code)) {
+        	$sql.= " , special_code=".$this->special_code;
+        }
         $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
-        if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
+        if (! empty($this->rang)) {
+        	$sql.= ", rang=".$this->rang;
+        }
         $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
         $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
 
@@ -3054,9 +3213,11 @@ 
         $resql=$this->db->query($sql);
         if ($resql)
         {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+        		// For avoid conflicts if trigger used
         	{
         		$this->id=$this->rowid;
+        	}
         		$result=$this->insertExtraFields();
         		if ($result < 0)
         		{
@@ -3078,8 +3239,7 @@ 
 
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -3111,8 +3271,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();

htdocs/blockedlog/class/blockedlog.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -423,7 +423,7 @@
 	 *	@param	string $element      	element to search
 	 *	@param	int $fk_object			id of object to search
 	 *	@param	int $limit      		max number of element, 0 for all
-	 *	@param	string $order      		sort of query
+	 *	@param	integer $order      		sort of query
 	 *	@return	array					array of object log
 	 */
 	public function getLog($element, $fk_object, $limit = 0, $order = -1) {

Indentation +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 
 	/**
 	 *      try to retrieve user author
-	*/
+	 */
 	public function getUser() {
 		global $langs, $cachedUser;
 

Spacing +109 added lines, -109 removed lines

@@ -97,25 +97,25 @@ 
 	public function getObjectLink() {
 		global $langs;
 
-		if($this->element === 'facture') {
+		if ($this->element === 'facture') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 			$object = new Facture($this->db);
-			if($object->fetch($this->fk_object)>0) {
+			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
 			}
-			else{
+			else {
 				$this->error++;
 			}
 		}
-		else if($this->element === 'payment') {
+		else if ($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 			$object = new Paiement($this->db);
-			if($object->fetch($this->fk_object)>0) {
+			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
 			}
-			else{
+			else {
 				$this->error++;
 			}
 		}
@@ -130,16 +130,16 @@ 
 	public function getUser() {
 		global $langs, $cachedUser;
 
-		if(empty($cachedUser))$cachedUser=array();
+		if (empty($cachedUser))$cachedUser = array();
 
-		if(empty($cachedUser[$this->fk_user])) {
-			$u=new User($this->db);
-			if($u->fetch($this->fk_user)>0) {
+		if (empty($cachedUser[$this->fk_user])) {
+			$u = new User($this->db);
+			if ($u->fetch($this->fk_user) > 0) {
 				$cachedUser[$this->fk_user] = $u;
 			}
 		}
 
-		if(!empty($cachedUser[$this->fk_user])) {
+		if (!empty($cachedUser[$this->fk_user])) {
 			return $cachedUser[$this->fk_user]->getNomUrl(1);
 		}
 
@@ -153,10 +153,10 @@ 
 	 */
 	public function setObjectData(&$object) {
 
-		if($object->element=='payment') {
+		if ($object->element == 'payment') {
 			$this->date_object = $object->datepaye;
 		}
-		else{
+		else {
 			$this->date_object = $object->date;
 		}
 
@@ -164,26 +164,26 @@ 
 		$this->element = $object->element;
 		$this->fk_object = $object->id;
 
-		$this->object_data=new stdClass();
+		$this->object_data = new stdClass();
 
-		if($this->element === 'facture') {
-			if(empty($object->thirdparty))$object->fetch_thirdparty();
+		if ($this->element === 'facture') {
+			if (empty($object->thirdparty))$object->fetch_thirdparty();
 			$this->object_data->thirdparty = new stdClass();
 
-			foreach($object->thirdparty as $key=>$value) {
-				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+			foreach ($object->thirdparty as $key=>$value) {
+				if (!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
 			}
 
 			$this->object_data->total_ht 	= (double) $object->total_ht;
 			$this->object_data->total_tva	= (double) $object->total_tva;
 			$this->object_data->total_ttc	= (double) $object->total_ttc;
-			$this->object_data->total_localtax1= (double) $object->total_localtax1;
-			$this->object_data->total_localtax2= (double) $object->total_localtax2;
+			$this->object_data->total_localtax1 = (double) $object->total_localtax1;
+			$this->object_data->total_localtax2 = (double) $object->total_localtax2;
 			$this->object_data->note_public	= (double) $object->note_public;
-			$this->object_data->note_private= (double) $object->note_private;
+			$this->object_data->note_private = (double) $object->note_private;
 
 		}
-		elseif($this->element==='payment'){
+		elseif ($this->element === 'payment') {
 
 			$this->object_data->amounts = $object->amounts;
 
@@ -206,54 +206,54 @@ 
 
 		if (empty($id))
 		{
-			$this->error='BadParameter';
+			$this->error = 'BadParameter';
 			return -1;
 		}
 
 		$langs->load("blockedlog");
 
 		$sql = "SELECT b.rowid, b.signature, b.amounts, b.action, b.element, b.fk_object, b.certified, b.tms, b.fk_user, b.date_object, b.ref_object, b.object_data";
-		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
-		if ($id) $sql.= " WHERE b.rowid = ". $id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
+		if ($id) $sql .= " WHERE b.rowid = ".$id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id				= $obj->rowid;
-				$this->ref				= $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
 
-				$this->signature		= $obj->signature;
+				$this->signature = $obj->signature;
 				$this->amounts			= (double) $obj->amounts;
-				$this->action			= $obj->action;
+				$this->action = $obj->action;
 				$this->element			= $obj->element;
 
-				$this->fk_object		= trim($obj->fk_object);
-				$this->date_object		= $this->db->jdate($obj->date_object);
-				$this->ref_object		= $obj->ref_object;
+				$this->fk_object = trim($obj->fk_object);
+				$this->date_object = $this->db->jdate($obj->date_object);
+				$this->ref_object = $obj->ref_object;
 
 				$this->certified		= ($obj->certified == 1);
 
 				$this->fk_user 			= $obj->fk_user;
 
-				$this->tms				= $this->db->jdate($obj->tms);
+				$this->tms = $this->db->jdate($obj->tms);
 
-				$this->object_data		= unserialize($obj->object_data);
+				$this->object_data = unserialize($obj->object_data);
 
 				return 1;
 			}
 			else
 			{
-				$this->error=$langs->trans("RecordNotFound");
+				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 
@@ -267,7 +267,7 @@ 
 	public function setCertified() {
 
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
-		if($res===false) return false;
+		if ($res === false) return false;
 
 		return true;
 
@@ -282,11 +282,11 @@ 
 	 */
 	public function create($user) {
 
-		global $conf,$langs,$hookmanager;
+		global $conf, $langs, $hookmanager;
 
 		$langs->load('blockedlog');
 
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this).'::create', LOG_DEBUG);
 
@@ -295,19 +295,19 @@ 
 
 		if (is_null($this->amounts))
 		{
-			$this->error=$langs->trans("BlockLogNeedAmountsValue");
+			$this->error = $langs->trans("BlockLogNeedAmountsValue");
 			dol_syslog($this->error, LOG_WARNING);
 			return -1;
 		}
 
-		if(empty($this->element)) {
-			$this->error=$langs->trans("BlockLogNeedElement");
+		if (empty($this->element)) {
+			$this->error = $langs->trans("BlockLogNeedElement");
 			dol_syslog($this->error, LOG_WARNING);
 			return -2;
 		}
 
-		if(empty($this->action)) {
-			$this->error=$langs->trans("BlockLogNeedAction");
+		if (empty($this->action)) {
+			$this->error = $langs->trans("BlockLogNeedAction");
 			dol_syslog($this->error, LOG_WARNING);
 			return -3;
 		}
@@ -317,32 +317,32 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
-		$sql.= "action,";
-		$sql.= " amounts,";
-		$sql.= " signature,";
-		$sql.= " signature_line,";
-		$sql.= " element,";
-		$sql.= " fk_object,";
-		$sql.= " date_object,";
-		$sql.= " ref_object,";
-		$sql.= " object_data,";
-		$sql.= " certified,";
-		$sql.= " fk_user,";
-		$sql.= " entity";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->action)."',";
-		$sql.= "".$this->amounts.",";
-		$sql.= "'".$this->db->escape($this->signature)."',";
-		$sql.= "'".$this->db->escape($this->signature_line)."',";
-		$sql.= "'".$this->db->escape($this->element)."',";
-		$sql.= "".$this->fk_object.",";
-		$sql.= "'".$this->db->idate($this->date_object)."',";
-		$sql.= "'".$this->db->escape($this->ref_object)."',";
-		$sql.= "'".$this->db->escape(serialize($this->object_data))."',";
-		$sql.= "0,";
-		$sql.= "".$user->id.",";
-		$sql.= $conf->entity;
-		$sql.= ")";
+		$sql .= "action,";
+		$sql .= " amounts,";
+		$sql .= " signature,";
+		$sql .= " signature_line,";
+		$sql .= " element,";
+		$sql .= " fk_object,";
+		$sql .= " date_object,";
+		$sql .= " ref_object,";
+		$sql .= " object_data,";
+		$sql .= " certified,";
+		$sql .= " fk_user,";
+		$sql .= " entity";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->action)."',";
+		$sql .= "".$this->amounts.",";
+		$sql .= "'".$this->db->escape($this->signature)."',";
+		$sql .= "'".$this->db->escape($this->signature_line)."',";
+		$sql .= "'".$this->db->escape($this->element)."',";
+		$sql .= "".$this->fk_object.",";
+		$sql .= "'".$this->db->idate($this->date_object)."',";
+		$sql .= "'".$this->db->escape($this->ref_object)."',";
+		$sql .= "'".$this->db->escape(serialize($this->object_data))."',";
+		$sql .= "0,";
+		$sql .= "".$user->id.",";
+		$sql .= $conf->entity;
+		$sql .= ")";
 
 		$res = $this->db->query($sql);
 		if ($res)
@@ -365,7 +365,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -380,7 +380,7 @@ 
 	 */
 	private function crypt($value) {
 
-		return hash('sha256',$value);
+		return hash('sha256', $value);
 
 	}
 
@@ -397,7 +397,7 @@ 
 
 		$res = ($signature_to_test === $this->signature);
 
-		if(!$res) {
+		if (!$res) {
 			$this->error++;
 		}
 
@@ -407,23 +407,23 @@ 
 	/**
 	 *	set current signatures
 	 */
-	 private function getSignatureRecursive(){
+	 private function getSignatureRecursive() {
 
-		$this->signature_line = $this->crypt( $this->action . $this->getSignature() . $this->amounts . print_r($this->object_data, true) );
+		$this->signature_line = $this->crypt($this->action.$this->getSignature().$this->amounts.print_r($this->object_data, true));
 		/*if($this->signature=='d6320580a02c1ab67fcc0a6d49d453c7d96dda0148901736f7f55725bfe1b900' || $this->signature=='ea65d435ff12ca929936a406aa9d707d99fb334c127878d256b602a5541bbbc9') {
 			var_dump($this->signature_line,$this->action ,$this->getSignature() , $this->amounts , $this->object_data);
 		}*/
 		$this->signature = $this->signature_line;
 
-		$logs = $this->getLog('all', 0, 0, 1) ;
-		if($logs!==false) {
-			foreach($logs as &$b) {
+		$logs = $this->getLog('all', 0, 0, 1);
+		if ($logs !== false) {
+			foreach ($logs as &$b) {
 
-				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
+				if ($this->id > 0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
 
 				$b->getCurrentValue(); // on récupère la valeur actuelle en base de l'élément enregistré
 
-				$this->signature = $this->crypt($this->signature. $this->action . $b->signature . $b->amounts);
+				$this->signature = $this->crypt($this->signature.$this->action.$b->signature.$b->amounts);
 			}
 		}
 
@@ -439,48 +439,48 @@ 
 	 *	@return	array					array of object log
 	 */
 	public function getLog($element, $fk_object, $limit = 0, $order = -1) {
-		global $conf,$cachedlogs ;
+		global $conf, $cachedlogs;
 
 		/* $cachedlogs allow fastest search */
-		if(empty($cachedlogs)) $cachedlogs=array();
+		if (empty($cachedlogs)) $cachedlogs = array();
 
 
-		if($element=='all') {
+		if ($element == 'all') {
 
-	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
 
 		}
-		else if($element=='not_certified') {
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+		else if ($element == 'not_certified') {
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
 
 		}
-		else if($element=='just_certified') {
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+		else if ($element == 'just_certified') {
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
 
 		}
-		else{
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+		else {
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE element='".$element."' AND fk_object=".(int) $fk_object;
 
 		}
 
-		$sql.=($order<0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
+		$sql .= ($order < 0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
 
-		if($limit > 0 )$sql.=' LIMIT '.$limit;
+		if ($limit > 0)$sql .= ' LIMIT '.$limit;
 
 		$res = $this->db->query($sql);
 
-		if($res) {
+		if ($res) {
 
-			$results=array();
+			$results = array();
 
-			while($obj = $this->db->fetch_object($res)) {
+			while ($obj = $this->db->fetch_object($res)) {
 
-				if(!isset($cachedlogs[$obj->rowid])) {
-					$b=new BlockedLog($this->db);
+				if (!isset($cachedlogs[$obj->rowid])) {
+					$b = new BlockedLog($this->db);
 					$b->fetch($obj->rowid);
 
 					$cachedlogs[$obj->rowid] = $b;
@@ -492,7 +492,7 @@ 
 
 			return $results;
 		}
-		else{
+		else {
 			return false;
 		}
 	}
@@ -502,20 +502,20 @@ 
 	 */
 	private function getCurrentValue() {
 
-		if($this->element === 'payment') {
-			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
+		if ($this->element === 'payment') {
+			$sql = "SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
 
 			$res = $this->db->query($sql);
 
-			if($res && $obj = $this->db->fetch_object($res)) {
+			if ($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->amount;
 			}
 		}
-		elseif($this->element === 'facture') {
-			$sql="SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
+		elseif ($this->element === 'facture') {
+			$sql = "SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
 
 			$res = $this->db->query($sql);
-			if($res && $obj = $this->db->fetch_object($res)) {
+			if ($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->total_ttc;
 			}
 		}
@@ -528,17 +528,17 @@ 
 	 *	@return	string					current entity signature
 	 */
 	public function getSignature() {
-		global $db,$conf,$mysoc;
+		global $db, $conf, $mysoc;
 
 		if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
 
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
+			$fingerprint = $this->crypt(print_r($mysoc, true).time().rand(0, 1000));
 
-			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, 'chaine',0,'Numeric Unique Fingerprint', $conf->entity);
+			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, 'chaine', 0, 'Numeric Unique Fingerprint', $conf->entity);
 
-			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT=$fingerprint;
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT = $fingerprint;
 		}
 
 		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;

Braces +39 added lines, -36 removed lines

@@ -103,19 +103,16 @@ 
 			$object = new Facture($this->db);
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
-			}
-			else{
+			} else{
 				$this->error++;
 			}
-		}
-		else if($this->element === 'payment') {
+		} else if($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 			$object = new Paiement($this->db);
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
-			}
-			else{
+			} else{
 				$this->error++;
 			}
 		}
@@ -130,7 +127,9 @@ 
 	public function getUser() {
 		global $langs, $cachedUser;
 
-		if(empty($cachedUser))$cachedUser=array();
+		if(empty($cachedUser)) {
+			$cachedUser=array();
+		}
 
 		if(empty($cachedUser[$this->fk_user])) {
 			$u=new User($this->db);
@@ -155,8 +154,7 @@ 
 
 		if($object->element=='payment') {
 			$this->date_object = $object->datepaye;
-		}
-		else{
+		} else{
 			$this->date_object = $object->date;
 		}
 
@@ -167,11 +165,15 @@ 
 		$this->object_data=new stdClass();
 
 		if($this->element === 'facture') {
-			if(empty($object->thirdparty))$object->fetch_thirdparty();
+			if(empty($object->thirdparty)) {
+				$object->fetch_thirdparty();
+			}
 			$this->object_data->thirdparty = new stdClass();
 
 			foreach($object->thirdparty as $key=>$value) {
-				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+				if(!is_object($value)) {
+					$this->object_data->thirdparty->{$key} = $value;
+				}
 			}
 
 			$this->object_data->total_ht 	= (double) $object->total_ht;
@@ -182,8 +184,7 @@ 
 			$this->object_data->note_public	= (double) $object->note_public;
 			$this->object_data->note_private= (double) $object->note_private;
 
-		}
-		elseif($this->element==='payment'){
+		} elseif($this->element==='payment'){
 
 			$this->object_data->amounts = $object->amounts;
 
@@ -214,7 +215,9 @@ 
 
 		$sql = "SELECT b.rowid, b.signature, b.amounts, b.action, b.element, b.fk_object, b.certified, b.tms, b.fk_user, b.date_object, b.ref_object, b.object_data";
 		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
-		if ($id) $sql.= " WHERE b.rowid = ". $id;
+		if ($id) {
+			$sql.= " WHERE b.rowid = ". $id;
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -244,14 +247,12 @@ 
 				$this->object_data		= unserialize($obj->object_data);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -267,7 +268,9 @@ 
 	public function setCertified() {
 
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
-		if($res===false) return false;
+		if($res===false) {
+			return false;
+		}
 
 		return true;
 
@@ -356,14 +359,12 @@ 
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -419,7 +420,10 @@ 
 		if($logs!==false) {
 			foreach($logs as &$b) {
 
-				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
+				if($this->id>0 && $b->id == $this->id) {
+					break;
+				}
+				// on arrête sur un enregistrement précis pour recalculer une signature
 
 				$b->getCurrentValue(); // on récupère la valeur actuelle en base de l'élément enregistré
 
@@ -442,7 +446,9 @@ 
 		global $conf,$cachedlogs ;
 
 		/* $cachedlogs allow fastest search */
-		if(empty($cachedlogs)) $cachedlogs=array();
+		if(empty($cachedlogs)) {
+			$cachedlogs=array();
+		}
 
 
 		if($element=='all') {
@@ -450,18 +456,15 @@ 
 	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
 
-		}
-		else if($element=='not_certified') {
+		} else if($element=='not_certified') {
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
 
-		}
-		else if($element=='just_certified') {
+		} else if($element=='just_certified') {
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
 
-		}
-		else{
+		} else{
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE element='".$element."' AND fk_object=".(int) $fk_object;
 
@@ -469,7 +472,9 @@ 
 
 		$sql.=($order<0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
 
-		if($limit > 0 )$sql.=' LIMIT '.$limit;
+		if($limit > 0 ) {
+			$sql.=' LIMIT '.$limit;
+		}
 
 		$res = $this->db->query($sql);
 
@@ -491,8 +496,7 @@ 
 			}
 
 			return $results;
-		}
-		else{
+		} else{
 			return false;
 		}
 	}
@@ -510,8 +514,7 @@ 
 			if($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->amount;
 			}
-		}
-		elseif($this->element === 'facture') {
+		} elseif($this->element === 'facture') {
 			$sql="SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
 
 			$res = $this->db->query($sql);