Dolibarr / dolibarr

htdocs/comm/propal/class/propal.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -391,11 +391,11 @@ 
      *      @param		string		$label				???
      *		@param      int			$date_start       	Start date of the line
      *		@param      int			$date_end         	End date of the line
-     *      @param		array		$array_options		extrafields array
+     *      @param		integer		$array_options		extrafields array
      * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
      *      @param		string		$origin				'order', ...
      *      @param		int			$origin_id			Id of origin object
-     * 		@param		double		$pu_ht_devise		Unit price in currency
+     * 		@param		integer		$pu_ht_devise		Unit price in currency
      * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
      *    	@return    	int         	    			>0 if OK, <0 if KO
      *    	@see       	add_product
@@ -615,9 +615,9 @@ 
      *  @param		int			$type				0/1=Product/service
      *	@param      int			$date_start       	Start date of the line
      *	@param      int			$date_end         	End date of the line
-	 *  @param		array		$array_options		extrafields array
+	 *  @param		integer		$array_options		extrafields array
      * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param		double		$pu_ht_devise		Unit price in currency
+	 * 	@param		integer		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
      *  @return     int     		        		0 if OK, <0 if KO
      */

Indentation +3342 added lines, -3342 removed lines

@@ -44,40 +44,40 @@ 
  */
 class Propal extends CommonObject
 {
-    public $element='propal';
-    public $table_element='propal';
-    public $table_element_line='propaldet';
-    public $fk_element='fk_propal';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='propal';
+	public $element='propal';
+	public $table_element='propal';
+	public $table_element_line='propaldet';
+	public $fk_element='fk_propal';
+	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';
 
 	/**
 	 * ID of the client
 	 * @var int
 	 */
-    public $socid;
+	public $socid;
 
-    public $contactid;
-    public $author;
-    public $ref_client;
+	public $contactid;
+	public $author;
+	public $ref_client;
 
 	/**
 	 * Status of the quote
 	 * @var int
 	 * @see Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED
 	 */
-    public $statut;
+	public $statut;
 
 	/**
 	 * @deprecated
 	 * @see date_creation
 	 */
-    public $datec;
+	public $datec;
 
 	/**
 	 * Creation date
@@ -89,7 +89,7 @@ 
 	 * @deprecated
 	 * @see date_validation
 	 */
-    public $datev;
+	public $datev;
 
 	/**
 	 * Validation date
@@ -101,62 +101,62 @@ 
 	 * Date of the quote
 	 * @var
 	 */
-    public $date;
+	public $date;
 
 	/**
 	 * @deprecated
 	 * @see date
 	 */
-    public $datep;
-    public $date_livraison;
-    public $fin_validite;
+	public $datep;
+	public $date_livraison;
+	public $fin_validite;
 
-    public $user_author_id;
-    public $user_valid_id;
-    public $user_close_id;
+	public $user_author_id;
+	public $user_valid_id;
+	public $user_close_id;
 
 	/**
 	 * @deprecated
 	 * @see total_ht
 	 */
-    public $price;
+	public $price;
 	/**
 	 * @deprecated
 	 * @see total_tva
 	 */
-    public $tva;
+	public $tva;
 	/**
 	 * @deprecated
 	 * @see total_ttc
 	 */
-    public $total;
-
-    public $cond_reglement_code;
-    public $mode_reglement_code;
-    public $remise;
-    public $remise_percent;
-    public $remise_absolue;
-    public $fk_address;
-    public $address_type;
-    public $address;
-    public $availability_id;
-    public $availability_code;
-    public $demand_reason_id;
-    public $demand_reason_code;
-
-    public $products=array();
-    public $extraparams=array();
+	public $total;
+
+	public $cond_reglement_code;
+	public $mode_reglement_code;
+	public $remise;
+	public $remise_percent;
+	public $remise_absolue;
+	public $fk_address;
+	public $address_type;
+	public $address;
+	public $availability_id;
+	public $availability_code;
+	public $demand_reason_id;
+	public $demand_reason_code;
+
+	public $products=array();
+	public $extraparams=array();
 
 	/**
 	 * @var PropaleLigne[]
 	 */
-    public $lines = array();
-    public $line;
+	public $lines = array();
+	public $line;
 
-    public $labelstatut=array();
-    public $labelstatut_short=array();
+	public $labelstatut=array();
+	public $labelstatut_short=array();
 
-    public $specimen;
+	public $specimen;
 
 	// Multicurrency
 	public $fk_multicurrency;
@@ -189,256 +189,256 @@ 
 	 */
 	const STATUS_BILLED = 4;   // Todo rename into STATUS_CLOSE ?
 
-    /**
-     *	Constructor
-     *
-     *	@param      DoliDB	$db         Database handler
-     *	@param      int		$socid		Id third party
-     *	@param      int		$propalid   Id proposal
-     */
-    function __construct($db, $socid="", $propalid=0)
-    {
-        global $conf,$langs;
-
-        $this->db = $db;
-        $this->socid = $socid;
-        $this->id = $propalid;
-        $this->products = array();
-        $this->remise = 0;
-        $this->remise_percent = 0;
-        $this->remise_absolue = 0;
-
-        $this->duree_validite=$conf->global->PROPALE_VALIDITY_DURATION;
-
-        $langs->load("propal");
-        $this->labelstatut[0]=(! empty($conf->global->PROPAL_STATUS_DRAFT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFT_LABEL : $langs->trans("PropalStatusDraft"));
-        $this->labelstatut[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATED_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATED_LABEL : $langs->trans("PropalStatusValidated"));
-        $this->labelstatut[2]=(! empty($conf->global->PROPAL_STATUS_SIGNED_LABEL) ? $conf->global->PROPAL_STATUS_SIGNED_LABEL : $langs->trans("PropalStatusSigned"));
-        $this->labelstatut[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNED_LABEL : $langs->trans("PropalStatusNotSigned"));
-        $this->labelstatut[4]=(! empty($conf->global->PROPAL_STATUS_BILLED_LABEL) ? $conf->global->PROPAL_STATUS_BILLED_LABEL : $langs->trans("PropalStatusBilled"));
-        $this->labelstatut_short[0]=(! empty($conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("PropalStatusDraftShort"));
-        $this->labelstatut_short[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
-        $this->labelstatut_short[2]=(! empty($conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("PropalStatusSignedShort"));
-        $this->labelstatut_short[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("PropalStatusNotSignedShort"));
-        $this->labelstatut_short[4]=(! empty($conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("PropalStatusBilledShort"));
-    }
-
-
-    /**
-     * 	Add line into array products
-     *	$this->thirdparty should be loaded
-     *
-     * 	@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	Replace calls to this function by generation objet Ligne
-     *			inserted into table $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;
-            $vat_src_code = '';     // May be defined into tva_tx
-
-            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
-            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
-
-            // multiprices
-            if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
-            {
-                $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else
-            {
-                $price = $prod->price;
-            }
-
-            $line = new PropaleLigne($this->db);
-
-            $line->fk_product=$idproduct;
-            $line->desc=$productdesc;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->vat_src_code=$vat_src_code;
-            $line->tva_tx=$tva_tx;
-	        $line->fk_unit=$prod->fk_unit;
+	/**
+	 *	Constructor
+	 *
+	 *	@param      DoliDB	$db         Database handler
+	 *	@param      int		$socid		Id third party
+	 *	@param      int		$propalid   Id proposal
+	 */
+	function __construct($db, $socid="", $propalid=0)
+	{
+		global $conf,$langs;
+
+		$this->db = $db;
+		$this->socid = $socid;
+		$this->id = $propalid;
+		$this->products = array();
+		$this->remise = 0;
+		$this->remise_percent = 0;
+		$this->remise_absolue = 0;
+
+		$this->duree_validite=$conf->global->PROPALE_VALIDITY_DURATION;
+
+		$langs->load("propal");
+		$this->labelstatut[0]=(! empty($conf->global->PROPAL_STATUS_DRAFT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFT_LABEL : $langs->trans("PropalStatusDraft"));
+		$this->labelstatut[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATED_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATED_LABEL : $langs->trans("PropalStatusValidated"));
+		$this->labelstatut[2]=(! empty($conf->global->PROPAL_STATUS_SIGNED_LABEL) ? $conf->global->PROPAL_STATUS_SIGNED_LABEL : $langs->trans("PropalStatusSigned"));
+		$this->labelstatut[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNED_LABEL : $langs->trans("PropalStatusNotSigned"));
+		$this->labelstatut[4]=(! empty($conf->global->PROPAL_STATUS_BILLED_LABEL) ? $conf->global->PROPAL_STATUS_BILLED_LABEL : $langs->trans("PropalStatusBilled"));
+		$this->labelstatut_short[0]=(! empty($conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("PropalStatusDraftShort"));
+		$this->labelstatut_short[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
+		$this->labelstatut_short[2]=(! empty($conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("PropalStatusSignedShort"));
+		$this->labelstatut_short[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("PropalStatusNotSignedShort"));
+		$this->labelstatut_short[4]=(! empty($conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("PropalStatusBilledShort"));
+	}
+
+
+	/**
+	 * 	Add line into array products
+	 *	$this->thirdparty should be loaded
+	 *
+	 * 	@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	Replace calls to this function by generation objet Ligne
+	 *			inserted into table $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;
+			$vat_src_code = '';     // May be defined into tva_tx
+
+			$localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
+			$localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
+
+			// multiprices
+			if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
+			{
+				$price = $prod->multiprices[$this->thirdparty->price_level];
+			}
+			else
+			{
+				$price = $prod->price;
+			}
+
+			$line = new PropaleLigne($this->db);
+
+			$line->fk_product=$idproduct;
+			$line->desc=$productdesc;
+			$line->qty=$qty;
+			$line->subprice=$price;
+			$line->remise_percent=$remise_percent;
+			$line->vat_src_code=$vat_src_code;
+			$line->tva_tx=$tva_tx;
+			$line->fk_unit=$prod->fk_unit;
 			if ($tva_npr) $line->info_bits = 1;
 
-            $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;
-            }
-
-            $line=new PropaleLigne($this->db);
-
-            $this->line->context = $this->context;
-
-            $line->fk_propal=$this->id;
-            $line->fk_remise_except=$remise->id;
-            $line->desc=$remise->description;   	// Description ligne
-            $line->vat_src_code=$remise->vat_src_code;
-            $line->tva_tx=$remise->tva_tx;
-            $line->subprice=-$remise->amount_ht;
-            $line->fk_product=0;					// Id produit predefined
-            $line->qty=1;
-            $line->remise=0;
-            $line->remise_percent=0;
-            $line->rang=-1;
-            $line->info_bits=2;
-
-            // TODO deprecated
-            $line->price=-$remise->amount_ht;
-
-            $line->total_ht  = -$remise->amount_ht;
-            $line->total_tva = -$remise->amount_tva;
-            $line->total_ttc = -$remise->amount_ttc;
-
-            $result=$line->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=$line->error;
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     *    	Add a proposal line into database (linked to product/service or not)
-     *      The parameters are already supposed to be appropriate and with final values to the call
-     *      of this method. Also, for the VAT rate, it must have already been defined
-     *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
-     *      and desc must already have the right value (it's up to the caller to manage multilanguage)
-     *
-     * 		@param    	string		$desc				Description de la ligne
-     * 		@param    	float		$pu_ht				Prix unitaire
-     * 		@param    	float		$qty             	Quantite
-     * 		@param    	float		$txtva           	Taux de tva
-     * 		@param		float		$txlocaltax1		Local tax 1 rate
-     *  	@param		float		$txlocaltax2		Local tax 2 rate
-     *		@param    	int			$fk_product      	Id du produit/service predefini
-     * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
-     * 		@param    	string		$price_base_type	HT or TTC
-     * 		@param    	float		$pu_ttc             Prix unitaire TTC
-     * 		@param    	int			$info_bits			Bits de type de lignes
-     *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
-     *      @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      int			$date_start       	Start date of the line
-     *		@param      int			$date_end         	End date of the line
-     *      @param		array		$array_options		extrafields array
-     * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-     *      @param		string		$origin				'order', ...
-     *      @param		int			$origin_id			Id of origin object
-     * 		@param		double		$pu_ht_devise		Unit price in currency
-     * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
-     *    	@return    	int         	    			>0 if OK, <0 if KO
-     *    	@see       	add_product
-     */
+			$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;
+			}
+
+			$line=new PropaleLigne($this->db);
+
+			$this->line->context = $this->context;
+
+			$line->fk_propal=$this->id;
+			$line->fk_remise_except=$remise->id;
+			$line->desc=$remise->description;   	// Description ligne
+			$line->vat_src_code=$remise->vat_src_code;
+			$line->tva_tx=$remise->tva_tx;
+			$line->subprice=-$remise->amount_ht;
+			$line->fk_product=0;					// Id produit predefined
+			$line->qty=1;
+			$line->remise=0;
+			$line->remise_percent=0;
+			$line->rang=-1;
+			$line->info_bits=2;
+
+			// TODO deprecated
+			$line->price=-$remise->amount_ht;
+
+			$line->total_ht  = -$remise->amount_ht;
+			$line->total_tva = -$remise->amount_tva;
+			$line->total_ttc = -$remise->amount_ttc;
+
+			$result=$line->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=$line->error;
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 *    	Add a proposal line into database (linked to product/service or not)
+	 *      The parameters are already supposed to be appropriate and with final values to the call
+	 *      of this method. Also, for the VAT rate, it must have already been defined
+	 *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
+	 *      and desc must already have the right value (it's up to the caller to manage multilanguage)
+	 *
+	 * 		@param    	string		$desc				Description de la ligne
+	 * 		@param    	float		$pu_ht				Prix unitaire
+	 * 		@param    	float		$qty             	Quantite
+	 * 		@param    	float		$txtva           	Taux de tva
+	 * 		@param		float		$txlocaltax1		Local tax 1 rate
+	 *  	@param		float		$txlocaltax2		Local tax 2 rate
+	 *		@param    	int			$fk_product      	Id du produit/service predefini
+	 * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
+	 * 		@param    	string		$price_base_type	HT or TTC
+	 * 		@param    	float		$pu_ttc             Prix unitaire TTC
+	 * 		@param    	int			$info_bits			Bits de type de lignes
+	 *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
+	 *      @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      int			$date_start       	Start date of the line
+	 *		@param      int			$date_end         	End date of the line
+	 *      @param		array		$array_options		extrafields array
+	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 *      @param		string		$origin				'order', ...
+	 *      @param		int			$origin_id			Id of origin object
+	 * 		@param		double		$pu_ht_devise		Unit price in currency
+	 * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
+	 *    	@return    	int         	    			>0 if OK, <0 if KO
+	 *    	@see       	add_product
+	 */
 	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise=0, $fk_remise_except=0)
-    {
-    	global $mysoc, $conf, $langs;
-
-        dol_syslog(get_class($this)."::addline propalid=$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, fk_remise_except=".$fk_remise_except);
-        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);               // $txtva can have format '5.0(XXX)' or '5'
-        $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 == self::STATUS_DRAFT)
-        {
-            $this->db->begin();
-
-        	$product_type=$type;
+	{
+		global $mysoc, $conf, $langs;
+
+		dol_syslog(get_class($this)."::addline propalid=$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, fk_remise_except=".$fk_remise_except);
+		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);               // $txtva can have format '5.0(XXX)' or '5'
+		$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 == self::STATUS_DRAFT)
+		{
+			$this->db->begin();
+
+			$product_type=$type;
 			if (!empty($fk_product))
 			{
 				$product=new Product($this->db);
@@ -446,390 +446,390 @@ 
 				$product_type=$product->type;
 
 				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_PROPOSAL) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnProposal', $product->ref);
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnProposal', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
 			}
 
 			// 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);
-
-            // Clean vat code
-            $vat_src_code='';
-            if (preg_match('/\((.*)\)/', $txtva, $reg))
-            {
-                $vat_src_code = $reg[1];
-                $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, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
+			// 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);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$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, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 			$pu_ht  = $tabprice[3];
 			$pu_tva = $tabprice[4];
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            // 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 PropaleLigne($this->db);
-
-            $this->line->context = $this->context;
-
-            $this->line->fk_propal=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
+			// 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 PropaleLigne($this->db);
+
+			$this->line->context = $this->context;
+
+			$this->line->fk_propal=$this->id;
+			$this->line->label=$label;
+			$this->line->desc=$desc;
+			$this->line->qty=$qty;
 
 			$this->line->vat_src_code=$vat_src_code;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$txlocaltax1;
-            $this->line->localtax2_tx=$txlocaltax2;
+			$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->product_type=$type;
-            $this->line->fk_remise_except=$fk_remise_except;
-            $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->special_code=$special_code;
-            $this->line->fk_parent_line=$fk_parent_line;
-            $this->line->fk_unit=$fk_unit;
-
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+			$this->line->fk_product=$fk_product;
+			$this->line->product_type=$type;
+			$this->line->fk_remise_except=$fk_remise_except;
+			$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->special_code=$special_code;
+			$this->line->fk_parent_line=$fk_parent_line;
+			$this->line->fk_unit=$fk_unit;
+
+			$this->line->date_start=$date_start;
+			$this->line->date_end=$date_end;
 
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
-            $this->line->origin_id = $origin_id;
-            $this->line->origin = $origin;
+			$this->line->origin_id = $origin_id;
+			$this->line->origin = $origin;
 
 			// Multicurrency
 			$this->line->fk_multicurrency			= $this->fk_multicurrency;
 			$this->line->multicurrency_code			= $this->multicurrency_code;
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$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;
+			// 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;
+			// TODO deprecated
+			$this->line->price=$price;
+			$this->line->remise=$remise;
 
-            if (is_array($array_options) && count($array_options)>0) {
-            	$this->line->array_options=$array_options;
-            }
+			if (is_array($array_options) && count($array_options)>0) {
+				$this->line->array_options=$array_options;
+			}
 
-            $result=$this->line->insert();
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+			$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,$mysoc);	// 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      float		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
-     *  @param      float		$qty            	Quantity
-     *  @param      float		$remise_percent  	Remise effectuee sur le produit
-     *  @param      float		$txtva	          	Taux de TVA
-     * 	@param	  	float		$txlocaltax1		Local tax 1 rate
-     *  @param	  	float		$txlocaltax2		Local tax 2 rate
-     *  @param      string		$desc            	Description
-     *	@param	  	string		$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      int			$date_start       	Start date of the line
-     *	@param      int			$date_end         	End date of the line
+				// Mise a jour informations denormalisees au niveau de la propale meme
+				$result=$this->update_price(1,'auto',0,$mysoc);	// 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      float		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
+	 *  @param      float		$qty            	Quantity
+	 *  @param      float		$remise_percent  	Remise effectuee sur le produit
+	 *  @param      float		$txtva	          	Taux de TVA
+	 * 	@param	  	float		$txlocaltax1		Local tax 1 rate
+	 *  @param	  	float		$txlocaltax2		Local tax 2 rate
+	 *  @param      string		$desc            	Description
+	 *	@param	  	string		$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      int			$date_start       	Start date of the line
+	 *	@param      int			$date_end         	End date of the line
 	 *  @param		array		$array_options		extrafields array
-     * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
-     *  @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.0, $txlocaltax2=0.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, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0)
-    {
-        global $mysoc;
+	{
+		global $mysoc;
 
-        dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
+		dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
         txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, type=$type, date_start=$date_start, date_end=$date_end");
-        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 (empty($type)) $type=0;
-
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            $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);
-
-            // Clean vat code
-            $vat_src_code='';
-            if (preg_match('/\((.*)\)/', $txtva, $reg))
-            {
-                $vat_src_code = $reg[1];
-                $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, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
+		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 (empty($type)) $type=0;
+
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			$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);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$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, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 			$pu_ht  = $tabprice[3];
 			$pu_tva = $tabprice[4];
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            // Anciens indicateurs: $price, $remise (a ne plus utiliser)
-            $price = $pu;
-            if ($remise_percent > 0)
-            {
-                $remise = round(($pu * $remise_percent / 100), 2);
-                $price = $pu - $remise;
-            }
-
-            //Fetch current line from the database and then clone the object and set it in $oldline property
-            $line = new PropaleLigne($this->db);
-            $line->fetch($rowid);
+			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
+			$price = $pu;
+			if ($remise_percent > 0)
+			{
+				$remise = round(($pu * $remise_percent / 100), 2);
+				$price = $pu - $remise;
+			}
+
+			//Fetch current line from the database and then clone the object and set it in $oldline property
+			$line = new PropaleLigne($this->db);
+			$line->fetch($rowid);
 			$line->fetch_optionals(); // Fetch extrafields for oldcopy
 
 			$staticline = clone $line;
 
-            $line->oldline = $staticline;
-            $this->line = $line;
-            $this->line->context = $this->context;
-
-            // 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->vat_src_code		= $vat_src_code;
-            $this->line->tva_tx				= $txtva;
-            $this->line->localtax1_tx		= $txlocaltax1;
-            $this->line->localtax2_tx		= $txlocaltax2;
+			$line->oldline = $staticline;
+			$this->line = $line;
+			$this->line->context = $this->context;
+
+			// 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->vat_src_code		= $vat_src_code;
+			$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_ht;
-            $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->fk_unit	= $fk_unit;
+			$this->line->remise_percent		= $remise_percent;
+			$this->line->subprice			= $pu_ht;
+			$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->fk_unit	= $fk_unit;
 
 			$this->line->fk_fournprice = $fk_fournprice;
-            $this->line->pa_ht = $pa_ht;
+			$this->line->pa_ht = $pa_ht;
 
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+			$this->line->date_start=$date_start;
+			$this->line->date_end=$date_end;
 
-            // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+			// TODO deprecated
+			$this->line->price=$price;
+			$this->line->remise=$remise;
 
-            if (is_array($array_options) && count($array_options)>0) {
-            	$this->line->array_options=$array_options;
-            }
+			if (is_array($array_options) && count($array_options)>0) {
+				$this->line->array_options=$array_options;
+			}
 
 			// Multicurrency
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$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($notrigger);
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-                $this->update_price(1);
-
-                $this->fk_propal = $this->id;
-                $this->rowid = $rowid;
-
-                $this->db->commit();
-                return $result;
-            }
-            else
-            {
-                $this->error=$this->line->error;
-
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::updateline Erreur -2 Propal 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 == self::STATUS_DRAFT)
-        {
-            $line=new PropaleLigne($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 $conf,$hookmanager;
-        $error=0;
-
-        $now=dol_now();
-
-        // Clean parameters
-        if (empty($this->date)) $this->date=$this->datep;
-        $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
-        if (empty($this->availability_id)) $this->availability_id=0;
-        if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			$result=$this->line->update($notrigger);
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+				$this->update_price(1);
+
+				$this->fk_propal = $this->id;
+				$this->rowid = $rowid;
+
+				$this->db->commit();
+				return $result;
+			}
+			else
+			{
+				$this->error=$this->line->error;
+
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::updateline Erreur -2 Propal 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 == self::STATUS_DRAFT)
+		{
+			$line=new PropaleLigne($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 $conf,$hookmanager;
+		$error=0;
+
+		$now=dol_now();
+
+		// Clean parameters
+		if (empty($this->date)) $this->date=$this->datep;
+		$this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
+		if (empty($this->availability_id)) $this->availability_id=0;
+		if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
 
 		// Multicurrency
 		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
@@ -840,18 +840,18 @@ 
 			$this->multicurrency_tx = 1;
 		}
 
-        dol_syslog(get_class($this)."::create");
+		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
+		$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
+		// 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
@@ -864,111 +864,111 @@ 
 			}
 		}
 
-        if (empty($this->date))
-        {
-            $this->error="Date of proposal is required";
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -4;
-        }
-
-
-        $this->db->begin();
-
-        // Insert into database
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
-        $sql.= "fk_soc";
-        $sql.= ", price";
-        $sql.= ", remise";
-        $sql.= ", remise_percent";
-        $sql.= ", remise_absolue";
-        $sql.= ", tva";
-        $sql.= ", total";
-        $sql.= ", datep";
-        $sql.= ", datec";
-        $sql.= ", ref";
-        $sql.= ", fk_user_author";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", model_pdf";
-        $sql.= ", fin_validite";
-        $sql.= ", fk_cond_reglement";
-        $sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", ref_client";
-        $sql.= ", date_livraison";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_availability";
-        $sql.= ", fk_input_reason";
-        $sql.= ", fk_projet";
-        $sql.= ", fk_incoterms";
-        $sql.= ", location_incoterms";
-        $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($this->date)."'";
-        $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->fin_validite!=''?"'".$this->db->idate($this->fin_validite)."'":"NULL");
-        $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-        $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", '".$this->db->escape($this->ref_client)."'";
-        $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"NULL");
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".$this->availability_id;
-        $sql.= ", ".$this->demand_reason_id;
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-        $sql.= ", ".$conf->entity;
+		if (empty($this->date))
+		{
+			$this->error="Date of proposal is required";
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -4;
+		}
+
+
+		$this->db->begin();
+
+		// Insert into database
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
+		$sql.= "fk_soc";
+		$sql.= ", price";
+		$sql.= ", remise";
+		$sql.= ", remise_percent";
+		$sql.= ", remise_absolue";
+		$sql.= ", tva";
+		$sql.= ", total";
+		$sql.= ", datep";
+		$sql.= ", datec";
+		$sql.= ", ref";
+		$sql.= ", fk_user_author";
+		$sql.= ", note_private";
+		$sql.= ", note_public";
+		$sql.= ", model_pdf";
+		$sql.= ", fin_validite";
+		$sql.= ", fk_cond_reglement";
+		$sql.= ", fk_mode_reglement";
+		$sql.= ", fk_account";
+		$sql.= ", ref_client";
+		$sql.= ", date_livraison";
+		$sql.= ", fk_shipping_method";
+		$sql.= ", fk_availability";
+		$sql.= ", fk_input_reason";
+		$sql.= ", fk_projet";
+		$sql.= ", fk_incoterms";
+		$sql.= ", location_incoterms";
+		$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($this->date)."'";
+		$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->fin_validite!=''?"'".$this->db->idate($this->fin_validite)."'":"NULL");
+		$sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
+		$sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
+		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", '".$this->db->escape($this->ref_client)."'";
+		$sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"NULL");
+		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
+		$sql.= ", ".$this->availability_id;
+		$sql.= ", ".$this->demand_reason_id;
+		$sql.= ", ".($this->fk_project?$this->fk_project:"null");
+		$sql.= ", ".(int) $this->fk_incoterms;
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$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."propal");
+		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."propal");
 
-            if ($this->id)
-            {
-                $this->ref='(PROV'.$this->id.')';
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+			if ($this->id)
+			{
+				$this->ref='(PROV'.$this->id.')';
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."propal 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);
+				if (! $error)
+				{
+					$fk_parent_line=0;
+					$num=count($this->lines);
 
-                    for ($i=0;$i<$num;$i++)
-                    {
-                        // Reset fk_parent_line for line that are not child lines or 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;
-                        }
+					for ($i=0;$i<$num;$i++)
+					{
+						// Reset fk_parent_line for line that are not child lines or 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,
@@ -989,168 +989,168 @@ 
 							$this->lines[$i]->fk_fournprice,
 							$this->lines[$i]->pa_ht,
 							$this->lines[$i]->label,
-                            $this->lines[$i]->date_start,
+							$this->lines[$i]->date_start,
 							$this->lines[$i]->date_end,
 							$this->lines[$i]->array_options,
 							$this->lines[$i]->fk_unit,
-                            $this->element,
-                            $this->lines[$i]->id
+							$this->element,
+							$this->lines[$i]->id
 						);
 
-                        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 ($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;
+						}
+					}
+				}
 
-                // Set delivery address
-                if (! $error && $this->fk_delivery_address)
-                {
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-                    $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
-                    $sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
-                    $sql.= " AND entity = ".$conf->entity;
+				// Add linked object
+				if (! $error && $this->origin && $this->origin_id)
+				{
+					$ret = $this->add_object_linked();
+					if (! $ret)	dol_print_error($this->db);
+				}
+
+				// Set delivery address
+				if (! $error && $this->fk_delivery_address)
+				{
+					$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+					$sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
+					$sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
+					$sql.= " AND entity = ".$conf->entity;
 
-                    $result=$this->db->query($sql);
-                }
+					$result=$this->db->query($sql);
+				}
 
-                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)
-                    	// TODO le hook fait double emploi avec le trigger !!
-                    	$hookmanager->initHooks(array('propaldao'));
-                    	$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_CREATE',$user);
-                            if ($result < 0) { $error++; }
-                            // End call triggers
-                        }
-                    }
-                    else
+				if (! $error)
+				{
+					// Mise a jour infos denormalisees
+					$resql=$this->update_price(1);
+					if ($resql)
 					{
-                        $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 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)
-    {
-    	// i love this function because $this->products is not used in create function...
-        $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,$conf,$hookmanager;
+						$action='update';
+
+						// Actions on extra fields (by external module or standard code)
+						// TODO le hook fait double emploi avec le trigger !!
+						$hookmanager->initHooks(array('propaldao'));
+						$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_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 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)
+	{
+		// i love this function because $this->products is not used in create function...
+		$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,$conf,$hookmanager;
 
 		dol_include_once('/projet/class/project.class.php');
 
-        $this->context['createfromclone']='createfromclone';
+		$this->context['createfromclone']='createfromclone';
 
-        $error=0;
-        $now=dol_now();
+		$error=0;
+		$now=dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
 		// get extrafields so they will be clone
 		foreach($this->lines as $line)
 			$line->fetch_optionals($line->rowid);
 
-        // Load dest object
-        $clonedObj = clone $this;
+		// Load dest object
+		$clonedObj = clone $this;
 
-        $objsoc=new Societe($this->db);
+		$objsoc=new Societe($this->db);
 
-        // Change socid if needed
-        if (! empty($socid) && $socid != $clonedObj->socid)
-        {
-            if ($objsoc->fetch($socid) > 0)
-            {
-                $clonedObj->socid 				= $objsoc->id;
-                $clonedObj->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                $clonedObj->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $clonedObj->fk_delivery_address	= '';
+		// Change socid if needed
+		if (! empty($socid) && $socid != $clonedObj->socid)
+		{
+			if ($objsoc->fetch($socid) > 0)
+			{
+				$clonedObj->socid 				= $objsoc->id;
+				$clonedObj->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$clonedObj->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$clonedObj->fk_delivery_address	= '';
 
-                /*if (!empty($conf->projet->enabled))
+				/*if (!empty($conf->projet->enabled))
                 {
                     $project = new Project($db);
     				if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {
@@ -1160,189 +1160,189 @@ 
     					$clonedObj->fk_project = '';
     				}
                 }*/
-                $clonedObj->fk_project = '';    // A cloned proposal is set by default to no project.
-            }
-
-            // reset ref_client
-            $clonedObj->ref_client  = '';
-
-            // TODO Change product price if multi-prices
-        }
-        else
-        {
-            $objsoc->fetch($clonedObj->socid);
-        }
-
-        $clonedObj->id=0;
-        $clonedObj->ref='';
-        $clonedObj->statut=self::STATUS_DRAFT;
-
-        // Clear fields
-        $clonedObj->user_author	= $user->id;
-        $clonedObj->user_valid	= '';
-        $clonedObj->date		= $now;
-        $clonedObj->datep		= $now;    // deprecated
-        $clonedObj->fin_validite	= $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
-        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $clonedObj->ref_client	= '';
-
-        // Create clone
-
-        $result=$clonedObj->create($user);
-        if ($result < 0) $error++;
-        else
-        {
-			// copy internal contacts
-    		if ($clonedObj->copy_linked_contact($this, 'internal') < 0)
-            	$error++;
+				$clonedObj->fk_project = '';    // A cloned proposal is set by default to no project.
+			}
 
-            // copy external contacts if same company
-            elseif ($this->socid == $clonedObj->socid)
-            {
-		        if ($clonedObj->copy_linked_contact($this, 'external') < 0)
-					$error++;
-            }
-        }
-
-        if (! $error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters=array('objFrom'=>$this,'clonedObj'=>$clonedObj);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$clonedObj,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
-
-            // Call trigger
-            $result=$clonedObj->call_trigger('PROPAL_CLONE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-
-        unset($this->context['createfromclone']);
-
-        // End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $clonedObj->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='')
-    {
-
-        $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.datep as dp";
-        $sql.= ", p.fin_validite as dfv";
-        $sql.= ", p.date_livraison as date_livraison";
-        $sql.= ", p.model_pdf, p.ref_client, 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_delivery_address";
-        $sql.= ", p.fk_availability";
-        $sql.= ", p.fk_input_reason";
-        $sql.= ", p.fk_cond_reglement";
-        $sql.= ", p.fk_mode_reglement";
-        $sql.= ', p.fk_account';
-        $sql.= ", p.fk_shipping_method";
-        $sql.= ", p.fk_incoterms, p.location_incoterms";
-		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
-        $sql.= ", i.libelle as libelle_incoterms";
-        $sql.= ", c.label as statut_label";
-        $sql.= ", ca.code as availability_code, ca.label as availability";
-        $sql.= ", dr.code as demand_reason_code, dr.label as demand_reason";
-        $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."propal 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.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
+			// reset ref_client
+			$clonedObj->ref_client  = '';
+
+			// TODO Change product price if multi-prices
+		}
+		else
+		{
+			$objsoc->fetch($clonedObj->socid);
+		}
+
+		$clonedObj->id=0;
+		$clonedObj->ref='';
+		$clonedObj->statut=self::STATUS_DRAFT;
+
+		// Clear fields
+		$clonedObj->user_author	= $user->id;
+		$clonedObj->user_valid	= '';
+		$clonedObj->date		= $now;
+		$clonedObj->datep		= $now;    // deprecated
+		$clonedObj->fin_validite	= $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
+		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $clonedObj->ref_client	= '';
+
+		// Create clone
+
+		$result=$clonedObj->create($user);
+		if ($result < 0) $error++;
+		else
+		{
+			// copy internal contacts
+			if ($clonedObj->copy_linked_contact($this, 'internal') < 0)
+				$error++;
+
+			// copy external contacts if same company
+			elseif ($this->socid == $clonedObj->socid)
+			{
+				if ($clonedObj->copy_linked_contact($this, 'external') < 0)
+					$error++;
+			}
+		}
+
+		if (! $error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters=array('objFrom'=>$this,'clonedObj'=>$clonedObj);
+				$action='';
+				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$clonedObj,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
+
+			// Call trigger
+			$result=$clonedObj->call_trigger('PROPAL_CLONE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
+
+		unset($this->context['createfromclone']);
+
+		// End
+		if (! $error)
+		{
+			$this->db->commit();
+			return $clonedObj->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='')
+	{
+
+		$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.datep as dp";
+		$sql.= ", p.fin_validite as dfv";
+		$sql.= ", p.date_livraison as date_livraison";
+		$sql.= ", p.model_pdf, p.ref_client, 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_delivery_address";
+		$sql.= ", p.fk_availability";
+		$sql.= ", p.fk_input_reason";
+		$sql.= ", p.fk_cond_reglement";
+		$sql.= ", p.fk_mode_reglement";
+		$sql.= ', p.fk_account';
+		$sql.= ", p.fk_shipping_method";
+		$sql.= ", p.fk_incoterms, p.location_incoterms";
+		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
+		$sql.= ", i.libelle as libelle_incoterms";
+		$sql.= ", c.label as statut_label";
+		$sql.= ", ca.code as availability_code, ca.label as availability";
+		$sql.= ", dr.code as demand_reason_code, dr.label as demand_reason";
+		$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."propal 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.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
-        $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity IN (".getEntity('propal').")";
-        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->ref_client           = $obj->ref_client;
-                $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                 = $this->db->jdate($obj->dp);	// Proposal date
-                $this->datep                = $this->db->jdate($obj->dp);    // deprecated
-                $this->fin_validite         = $this->db->jdate($obj->dfv);
-                $this->date_livraison       = $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-                $this->availability_id      = $obj->fk_availability;
-                $this->availability_code    = $obj->availability_code;
-                $this->availability         = $obj->availability;
-                $this->demand_reason_id     = $obj->fk_input_reason;
-                $this->demand_reason_code   = $obj->demand_reason_code;
-                $this->demand_reason        = $obj->demand_reason;
-                $this->fk_address  			= $obj->fk_delivery_address;
-
-                $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;
+		$sql.= " WHERE p.fk_statut = c.id";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
+		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->ref_client           = $obj->ref_client;
+				$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                 = $this->db->jdate($obj->dp);	// Proposal date
+				$this->datep                = $this->db->jdate($obj->dp);    // deprecated
+				$this->fin_validite         = $this->db->jdate($obj->dfv);
+				$this->date_livraison       = $this->db->jdate($obj->date_livraison);
+				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+				$this->availability_id      = $obj->fk_availability;
+				$this->availability_code    = $obj->availability_code;
+				$this->availability         = $obj->availability;
+				$this->demand_reason_id     = $obj->fk_input_reason;
+				$this->demand_reason_code   = $obj->demand_reason_code;
+				$this->demand_reason        = $obj->demand_reason;
+				$this->fk_address  			= $obj->fk_delivery_address;
+
+				$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;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -1357,43 +1357,43 @@ 
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-                if ($obj->fk_statut == self::STATUS_DRAFT)
-                {
-                    $this->brouillon = 1;
-                }
+				if ($obj->fk_statut == self::STATUS_DRAFT)
+				{
+					$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);
+				// 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->db->free($resql);
 
-                $this->lines = array();
+				$this->lines = array();
 
-                /*
+				/*
                  * Lines
                  */
-                $result=$this->fetch_lines();
-                if ($result < 0)
-                {
-                    return -3;
-                }
+				$result=$this->fetch_lines();
+				if ($result < 0)
+				{
+					return -3;
+				}
 
-                return 1;
-            }
+				return 1;
+			}
 
-            $this->error="Record Not Found";
-            return 0;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
+			$this->error="Record Not Found";
+			return 0;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Load array lines
@@ -1500,1941 +1500,1941 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			return -3;
+			$this->error=$this->db->lasterror();
+			return -3;
+		}
+	}
+
+	/**
+	 *	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)
+	{
+		global $conf, $hookmanager;
+
+		$action='update';
+		$error = 0;
+
+		// Actions on extra fields (by external module or standard code)
+		// TODO le hook fait double emploi avec le trigger !!
+		$hookmanager->initHooks(array('propaldao'));
+		$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=Nothing done, >=0 if OK
+	 */
+	function valid($user, $notrigger=0)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		global $conf;
+
+		$error=0;
+
+		// Protection
+		if ($this->statut == self::STATUS_VALIDATED)
+		{
+			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->propal_advance->validate))))
+		{
+			$this->error='ErrorPermissionDenied';
+			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$now=dol_now();
+
+		$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."propal";
+		$sql.= " SET ref = '".$num."',";
+		$sql.= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql)
+		{
+			dol_print_error($this->db);
+			$error++;
+		}
+
+		// Trigger calls
+		if (! $error && ! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('PROPAL_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->propal->dir_output.'/'.$oldref;
+				$dirdest = $conf->propal->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->propal->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 = self::STATUS_VALIDATED;
+			$this->user_valid_id=$user->id;
+			$this->datev=$now;
+
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Define proposal date
+	 *
+	 *  @param  User		$user      	Object user that modify
+	 *  @param  int			$date		Date
+	 *  @param  int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @return	int         			<0 if KO, >0 if OK
+	 */
+	function set_date($user, $date, $notrigger=0)
+	{
+		if (empty($date))
+		{
+			$this->error='ErrorBadParameter';
+			dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		if (! empty($user->rights->propal->creer))
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->date = $date;
+				$this->datep = $date;    // deprecated
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+	/**
+	 *	Define end validity date
+	 *
+	 *	@param		User	$user        		Object user that modify
+	 *	@param      int		$date_fin_validite	End of validity date
+	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				<0 if KO, >0 if OK
+	 */
+	function set_echeance($user, $date_fin_validite, $notrigger=0)
+	{
+		if (! empty($user->rights->propal->creer))
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite!=''?"'".$this->db->idate($date_fin_validite)."'":'null');
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->fin_validite = $date_fin_validite;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 	$user        		Object user that modify
+	 *	@param      int		$date_livraison     Delivery date
+	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				<0 if ko, >0 if ok
+	 */
+	function set_date_livraison($user, $date_livraison, $notrigger=0)
+	{
+		if (! empty($user->rights->propal->creer))
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+			$sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->date_livraison = $date_livraison;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+	/**
+	 *  Set delivery
+	 *
+	 *  @param		User	$user		  	Object user that modify
+	 *  @param      int		$id				Availability id
+	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *  @return     int           			<0 if KO, >0 if OK
+	 */
+	function set_availability($user, $id, $notrigger=0)
+	{
+		if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+			$sql.= " SET fk_availability = '".$id."'";
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->fk_availability = $id;
+				$this->availability_id = $id;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$error_str='Propal status do not meet requirement '.$this->statut;
+			dol_syslog(__METHOD__.$error_str, LOG_ERR);
+			$this->error=$error_str;
+			$this->errors[]= $this->error;
+			return -2;
+		}
+	}
+
+	/**
+	 *  Set source of demand
+	 *
+	 *  @param		User	$user		Object user that modify
+	 *  @param      int		$id			Input reason id
+	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @return     int           		<0 if KO, >0 if OK
+	 */
+	function set_demand_reason($user, $id, $notrigger=0)
+	{
+		if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+			$sql.= " SET fk_input_reason = ".$id;
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->fk_input_reason = $id;
+				$this->demand_reason_id = $id;
+			}
+
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$error_str='Propal status do not meet requirement '.$this->statut;
+			dol_syslog(__METHOD__.$error_str, LOG_ERR);
+			$this->error=$error_str;
+			$this->errors[]= $this->error;
+			return -2;
+		}
+	}
+
+	/**
+	 * Set customer reference number
+	 *
+	 *  @param      User	$user			Object user that modify
+	 *  @param      string	$ref_client		Customer reference
+	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *  @return     int						<0 if ko, >0 if ok
+	 */
+	function set_ref_client($user, $ref_client, $notrigger=0)
+	{
+		if (! empty($user->rights->propal->creer))
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
+			$sql.= ' WHERE rowid = '.$this->id;
+
+			dol_syslog(__METHOD__.' $this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->ref_client = $ref_client;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 *	Set an overall discount on the proposal
+	 *
+	 *	@param      User	$user       Object user that modify
+	 *	@param      double	$remise     Amount discount
+	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	function set_remise_percent($user, $remise, $notrigger=0)
+	{
+		$remise=trim($remise)?trim($remise):0;
+
+		if (! empty($user->rights->propal->creer))
+		{
+			$remise = price2num($remise);
+
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".$remise;
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->remise_percent = $remise;
+				$this->update_price(1);
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+
+	/**
+	 *	Set an absolute overall discount on the proposal
+	 *
+	 *	@param      User	$user       Object user that modify
+	 *	@param      double	$remise     Amount discount
+	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	function set_remise_absolue($user, $remise, $notrigger=0)
+	{
+		$remise=trim($remise)?trim($remise):0;
+
+		if (! empty($user->rights->propal->creer))
+		{
+			$remise = price2num($remise);
+
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+			$sql.= " SET remise_absolue = ".$remise;
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->remise_absolue = $remise;
+				$this->update_price(1);
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+
+
+	/**
+	 *	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)
+	{
+
+		$this->statut = $statut;
+		$error=0;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+		$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 (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_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 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 cloture($user, $statut, $note, $notrigger=0)
+	{
+		global $langs,$conf;
+
+		$error=0;
+		$now=dol_now();
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+		$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->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
+			$trigger_name='PROPAL_CLOSE_REFUSED';
+
+			if ($statut == self::STATUS_SIGNED)
+			{
+				$trigger_name='PROPAL_CLOSE_SIGNED';
+				$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+
+				// The connected company is classified as a client
+				$soc=new Societe($this->db);
+				$soc->id = $this->socid;
+				$result=$soc->set_as_client();
+
+				if ($result < 0)
+				{
+					$this->error=$this->db->lasterror();
+					$this->db->rollback();
+					return -2;
+				}
+			}
+			if ($statut == self::STATUS_BILLED)
+			{
+				$trigger_name='PROPAL_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);
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->statut = $statut;
+				$this->date_cloture = $now;
+				$this->note_private = $note;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// 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->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Class invoiced the Propal
+	 *
+	 *	@param  	User	$user    	Object user
+	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return     int     			<0 si ko, >0 si ok
+	 */
+	function classifyBilled(User $user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = '.self::STATUS_BILLED;
+		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (!$resql)
+		{
+			$this->errors[]=$this->db->error();
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$this->oldcopy= clone $this;
+			$this->statut=self::STATUS_BILLED;
+		}
+
+		if (! $notrigger && empty($error))
+		{
+			// Call trigger
+			$result=$this->call_trigger('PROPAL_MODIFY',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+	}
+
+	/**
+	 *	Class invoiced the Propal
+	 *
+	 *	@return     int     	<0 si ko, >0 si ok
+	 *  @deprecated
+	 *  @see classifyBilled()
+	 */
+	function classer_facturee()
+	{
+		global $user;
+		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+
+		return $this->classifyBilled($user);
+	}
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param		User	$user		Object user that modify
+	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return		int					<0 if KO, >0 if OK
+	 */
+	function set_draft($user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = ".self::STATUS_DRAFT;
+		$sql.= " WHERE rowid = ".$this->id;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (!$resql)
+		{
+			$this->errors[]=$this->db->error();
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$this->oldcopy= clone $this;
+			$this->statut = self::STATUS_DRAFT;
+			$this->brouillon = 1;
+		}
+
+		if (! $notrigger && empty($error))
+		{
+			// Call trigger
+			$result=$this->call_trigger('PROPAL_MODIFY',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+	}
+
+
+	/**
+	 *    Return list of proposal (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.datep', $sortorder='DESC')
+	{
+		global $user;
+
+		$ga = array();
+
+		$sql = "SELECT s.rowid, s.nom as name, s.client,";
+		$sql.= " p.rowid as propalid, 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."propal 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 IN (".getEntity('propal').")";
+		$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 = ".self::STATUS_DRAFT;
+		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->propalid] = $obj->ref;
+					}
+					else if ($shortlist == 2)
+					{
+						$ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
+					}
+					else
+					{
+						$ga[$i]['id']	= $obj->propalid;
+						$ga[$i]['ref'] 	= $obj->ref;
+						$ga[$i]['name'] = $obj->name;
+					}
+
+					$i++;
+				}
+			}
+			return $ga;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Returns an array with the numbers of related invoices
+	 *
+	 *	@return	array		Array of invoices
+	 */
+	function getInvoiceArrayList()
+	{
+		return $this->InvoiceArrayList($this->id);
+	}
+
+	/**
+	 *  Returns an array with id and ref of related invoices
+	 *
+	 *	@param		int		$id			Id propal
+	 *	@return		array				Array of invoices id
+	 */
+	function InvoiceArrayList($id)
+	{
+		$ga = array();
+		$linkedInvoices = array();
+
+		$this->fetchObjectLinked($id,$this->element);
+		foreach($this->linkedObjectsIds as $objecttype => $objectid)
+		{
+			// Nouveau système du comon object renvoi des rowid et non un id linéaire de 1 à n
+			// On parcourt donc une liste d'objets en tant qu'objet unique
+			foreach($objectid as $key => $object)
+			{
+				// Cas des factures liees directement
+				if ($objecttype == 'facture')
+				{
+					$linkedInvoices[] = $object;
+				}
+				// Cas des factures liees par un autre objet (ex: commande)
+				else
+				{
+					$this->fetchObjectLinked($object,$objecttype);
+					foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid)
+					{
+						foreach($subobjectid as $subkey => $subobject)
+						{
+							if ($subobjecttype == 'facture')
+							{
+								$linkedInvoices[] = $subobject;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (count($linkedInvoices) > 0)
+		{
+			$sql= "SELECT rowid as facid, facnumber, total, datef as df, fk_user_author, fk_statut, paye";
+			$sql.= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql.= " WHERE rowid IN (".implode(',',$linkedInvoices).")";
+
+			dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+
+			if ($resql)
+			{
+				$tab_sqlobj=array();
+				$nump = $this->db->num_rows($resql);
+				for ($i = 0;$i < $nump;$i++)
+				{
+					$sqlobj = $this->db->fetch_object($resql);
+					$tab_sqlobj[] = $sqlobj;
+				}
+				$this->db->free($resql);
+
+				$nump = count($tab_sqlobj);
+
+				if ($nump)
+				{
+					$i = 0;
+					while ($i < $nump)
+					{
+						$obj = array_shift($tab_sqlobj);
+
+						$ga[$i] = $obj;
+
+						$i++;
+					}
+				}
+				return $ga;
+			}
+			else
+			{
+				return -1;
+			}
+		}
+		else return $ga;
+	}
+
+	/**
+	 *	Delete proposal
+	 *
+	 *	@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;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('PROPAL_DELETE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = ".$this->id;
+			if ($this->db->query($sql))
+			{
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$this->id;
+				if ($this->db->query($sql))
+				{
+					// Delete linked object
+					$res = $this->deleteObjectLinked();
+					if ($res < 0) $error++;
+
+					// Delete linked contacts
+					$res = $this->delete_linked_contact();
+					if ($res < 0) $error++;
+
+					if (! $error)
+					{
+						// We remove directory
+						$ref = dol_sanitizeFileName($this->ref);
+						if ($conf->propal->dir_output && !empty($this->ref))
+						{
+							$dir = $conf->propal->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;
+		}
+	}
+
+	/**
+	 *  Change the delivery time
+	 *
+	 *  @param	int	$availability_id	Id of new delivery time
+	 * 	@param	int	$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *  @return int                  	>0 if OK, <0 if KO
+	 *  @deprecated  use set_availability
+	 */
+	function availability($availability_id, $notrigger=0)
+	{
+		global $user;
+
+		if ($this->statut >= self::STATUS_DRAFT)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
+			$sql .= ' SET fk_availability = '.$availability_id;
+			$sql .= ' WHERE rowid='.$this->id;
+
+			dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->availability_id = $availability_id;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$error_str='Propal status do not meet requirement '.$this->statut;
+			dol_syslog(__METHOD__.$error_str, LOG_ERR);
+			$this->error=$error_str;
+			$this->errors[]= $this->error;
+			return -2;
+		}
+	}
+
+	/**
+	 *	Change source demand
+	 *
+	 *	@param	int $demand_reason_id 	Id of new source demand
+	 * 	@param	int	$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return int						>0 si ok, <0 si ko
+	 *	@deprecated use set_demand_reason
+	 */
+	function demand_reason($demand_reason_id, $notrigger=0)
+	{
+		if ($this->statut >= self::STATUS_DRAFT)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
+			$sql .= ' SET fk_input_reason = '.$demand_reason_id;
+			$sql .= ' WHERE rowid='.$this->id;
+
+			dol_syslog(__METHOD__.' demand_reason('.$demand_reason_id.')', LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->demand_reason_id = $demand_reason_id;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROPAL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$error_str='Propal status do not meet requirement '.$this->statut;
+			dol_syslog(__METHOD__.$error_str, LOG_ERR);
+			$this->error=$error_str;
+			$this->errors[]= $this->error;
+			return -2;
+		}
+	}
+
+
+	/**
+	 *	Object Proposal 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."propal 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, 6=Long label + Picto
+	 *    	@return     string		Label
+	 */
+	 function LibStatut($statut,$mode=1)
+	{
+		global $langs;
+		$langs->load("propal");
+
+		if ($statut==self::STATUS_DRAFT) $statuttrans='statut0';
+		if ($statut==self::STATUS_VALIDATED) $statuttrans='statut1';
+		if ($statut==self::STATUS_SIGNED) $statuttrans='statut3';
+		if ($statut==self::STATUS_NOTSIGNED) $statuttrans='statut5';
+		if ($statut==self::STATUS_BILLED) $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_short[$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 proposal to close, "signed" for proposal to invoice
+	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	function load_board($user,$mode)
+	{
+		global $conf, $langs;
+
+		$clause = " WHERE";
+
+		$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
+		$sql.= " FROM ".MAIN_DB_PREFIX."propal 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 IN (".getEntity('propal').")";
+		if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
+		if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
+		if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$langs->load("propal");
+			$now=dol_now();
+
+			if ($mode == 'opened') {
+				$delay_warning=$conf->propal->cloture->warning_delay;
+				$statut = self::STATUS_VALIDATED;
+				$label = $langs->trans("PropalsToClose");
+			}
+			if ($mode == 'signed') {
+				$delay_warning=$conf->propal->facturation->warning_delay;
+				$statut = self::STATUS_SIGNED;
+				$label = $langs->trans("PropalsToBill");         // We set here bill but may be billed or ordered
+			}
+
+			$response = new WorkboardResponse();
+			$response->warning_delay = $delay_warning/60/60/24;
+			$response->label = $label;
+			$response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
+			$response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
+			$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->error();
+			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 $langs;
+
+		// 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->ref_client='NEMICEPS';
+		$this->specimen=1;
+		$this->socid = 1;
+		$this->date = time();
+		$this->fin_validite = $this->date+3600*24*30;
+		$this->cond_reglement_id   = 1;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_id   = 7;
+		$this->mode_reglement_code = 'CHQ';
+		$this->availability_id     = 1;
+		$this->availability_code   = 'AV_NOW';
+		$this->demand_reason_id    = 1;
+		$this->demand_reason_code  = 'SRC_00';
+		$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 PropaleLigne($this->db);
+			$line->desc=$langs->trans("Description")." ".$xnbp;
+			$line->qty=1;
+			$line->subprice=100;
+			$line->price=100;
+			$line->tva_tx=20;
+			$line->localtax1_tx=0;
+			$line->localtax2_tx=0;
+			if ($xnbp == 2)
+			{
+				$line->total_ht=50;
+				$line->total_ttc=60;
+				$line->total_tva=10;
+				$line->remise_percent=50;
+			}
+			else
+			{
+				$line->total_ht=100;
+				$line->total_ttc=120;
+				$line->total_tva=20;
+				$line->remise_percent=00;
+			}
+
+			if ($num_prods > 0)
+			{
+				$prodid = mt_rand(1, $num_prods);
+				$line->fk_product=$prodids[$prodid];
+		$line->product_ref='SPECIMEN';
+			}
+
+			$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 $user;
+
+		$this->nb=array();
+		$clause = "WHERE";
+
+		$sql = "SELECT count(p.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."propal 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 IN (".getEntity('propal').")";
+
+		$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["proposals"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$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)
-    {
-        global $conf, $hookmanager;
-
-    	$action='update';
-        $error = 0;
-
-    	// Actions on extra fields (by external module or standard code)
-    	// TODO le hook fait double emploi avec le trigger !!
-    	$hookmanager->initHooks(array('propaldao'));
-    	$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=Nothing done, >=0 if OK
-     */
-    function valid($user, $notrigger=0)
-    {
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    	global $conf;
-
-        $error=0;
-
-        // Protection
-        if ($this->statut == self::STATUS_VALIDATED)
-        {
-            dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
-            return 0;
-        }
-
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->propal_advance->validate))))
-        {
-            $this->error='ErrorPermissionDenied';
-            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        $now=dol_now();
-
-        $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."propal";
-        $sql.= " SET ref = '".$num."',";
-        $sql.= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-        $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
-        dol_syslog(get_class($this)."::valid", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
-		{
-			dol_print_error($this->db);
-			$error++;
-		}
+	/**
+	 *  Returns the reference to the following non used Proposal used depending on the active numbering module
+	 *  defined into PROPALE_ADDON
+	 *
+	 *  @param	Societe		$soc  	Object thirdparty
+	 *  @return string      		Reference libre pour la propale
+	 */
+	function getNextNumRef($soc)
+	{
+		global $conf,$langs;
+		$langs->load("propal");
 
-		// Trigger calls
-		if (! $error && ! $notrigger)
+		if (! empty($conf->global->PROPALE_ADDON))
 		{
-            // Call trigger
-            $result=$this->call_trigger('PROPAL_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->propal->dir_output.'/'.$oldref;
-        		$dirdest = $conf->propal->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->propal->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 = self::STATUS_VALIDATED;
-        	$this->user_valid_id=$user->id;
-        	$this->datev=$now;
-
-        	$this->db->commit();
-        	return 1;
-        }
-        else
-		{
-        	$this->db->rollback();
-        	return -1;
-        }
-    }
-
-
-    /**
-     *  Define proposal date
-     *
-     *  @param  User		$user      	Object user that modify
-     *  @param  int			$date		Date
-     *  @param  int			$notrigger	1=Does not execute triggers, 0= execute triggers
-     *  @return	int         			<0 if KO, >0 if OK
-     */
-    function set_date($user, $date, $notrigger=0)
-    {
-        if (empty($date))
-        {
-            $this->error='ErrorBadParameter';
-            dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        if (! empty($user->rights->propal->creer))
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->date = $date;
-            	$this->datep = $date;    // deprecated
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-    /**
-     *	Define end validity date
-     *
-     *	@param		User	$user        		Object user that modify
-     *	@param      int		$date_fin_validite	End of validity date
-     *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         				<0 if KO, >0 if OK
-     */
-    function set_echeance($user, $date_fin_validite, $notrigger=0)
-    {
-        if (! empty($user->rights->propal->creer))
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite!=''?"'".$this->db->idate($date_fin_validite)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->fin_validite = $date_fin_validite;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-    /**
-     *	Set delivery date
-     *
-     *	@param      User 	$user        		Object user that modify
-     *	@param      int		$date_livraison     Delivery date
-     *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         				<0 if ko, >0 if ok
-     */
-    function set_date_livraison($user, $date_livraison, $notrigger=0)
-    {
-        if (! empty($user->rights->propal->creer))
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->date_livraison = $date_livraison;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-    /**
-     *  Set delivery
-     *
-     *  @param		User	$user		  	Object user that modify
-     *  @param      int		$id				Availability id
-     *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *  @return     int           			<0 if KO, >0 if OK
-     */
-    function set_availability($user, $id, $notrigger=0)
-    {
-        if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET fk_availability = '".$id."'";
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->fk_availability = $id;
-            	$this->availability_id = $id;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
-        	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
-        	return -2;
-        }
-    }
-
-    /**
-     *  Set source of demand
-     *
-     *  @param		User	$user		Object user that modify
-     *  @param      int		$id			Input reason id
-     *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *  @return     int           		<0 if KO, >0 if OK
-     */
-    function set_demand_reason($user, $id, $notrigger=0)
-    {
-        if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET fk_input_reason = ".$id;
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->fk_input_reason = $id;
-            	$this->demand_reason_id = $id;
-            }
-
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
-        	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
-        	return -2;
-        }
-    }
-
-    /**
-     * Set customer reference number
-     *
-     *  @param      User	$user			Object user that modify
-     *  @param      string	$ref_client		Customer reference
-     *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *  @return     int						<0 if ko, >0 if ok
-     */
-    function set_ref_client($user, $ref_client, $notrigger=0)
-    {
-        if (! empty($user->rights->propal->creer))
-        {
-            $error=0;
-
-            $this->db->begin();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
-            $sql.= ' WHERE rowid = '.$this->id;
-
-            dol_syslog(__METHOD__.' $this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->ref_client = $ref_client;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    /**
-     *	Set an overall discount on the proposal
-     *
-     *	@param      User	$user       Object user that modify
-     *	@param      double	$remise     Amount discount
-     *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function set_remise_percent($user, $remise, $notrigger=0)
-    {
-        $remise=trim($remise)?trim($remise):0;
-
-        if (! empty($user->rights->propal->creer))
-        {
-            $remise = price2num($remise);
-
-            $error=0;
-
-            $this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->remise_percent = $remise;
-            	$this->update_price(1);
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-
-    /**
-     *	Set an absolute overall discount on the proposal
-     *
-     *	@param      User	$user       Object user that modify
-     *	@param      double	$remise     Amount discount
-     *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function set_remise_absolue($user, $remise, $notrigger=0)
-    {
-        $remise=trim($remise)?trim($remise):0;
-
-        if (! empty($user->rights->propal->creer))
-        {
-            $remise = price2num($remise);
-
-            $error=0;
-
-            $this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET remise_absolue = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->remise_absolue = $remise;
-            	$this->update_price(1);
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-
-
-    /**
-     *	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)
-    {
-
-        $this->statut = $statut;
-        $error=0;
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-        $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;
+			$mybool=false;
 
-    	$this->db->begin();
+			$file = $conf->global->PROPALE_ADDON.".php";
+			$classname = $conf->global->PROPALE_ADDON;
 
-		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)
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+
+				$dir = dol_buildpath($reldir."core/modules/propale/");
+
+				// Load file with numbering class (if found)
+				$mybool|=@include_once $dir.$file;
+			}
+
+			if (! $mybool)
 			{
-                // Call trigger
-                $result=$this->call_trigger('PROPAL_REOPEN',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				dol_print_error('',"Failed to include file ".$file);
+				return '';
 			}
-		}
 
-		// 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;
+			$obj = new $classname();
+			$numref = "";
+			$numref = $obj->getNextValue($soc,$this);
+
+			if ($numref != "")
+			{
+				return $numref;
+			}
+			else
+			{
+				$this->error=$obj->error;
+				//dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
+				return "";
+			}
 		}
 		else
 		{
-			$this->db->commit();
-			return 1;
+			$langs->load("errors");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			return "";
 		}
-    }
-
-
-    /**
-     *	Close 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 cloture($user, $statut, $note, $notrigger=0)
-    {
-        global $langs,$conf;
+	}
 
-        $error=0;
-        $now=dol_now();
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int		$withpicto		          Add picto into link
+	 *	@param      string	$option			          Where point the link ('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;
 
-        $this->db->begin();
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-        $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;
+		$result='';
+		$label='';
+		$url='';
 
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-        	$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
-        	$trigger_name='PROPAL_CLOSE_REFUSED';
+		if ($user->rights->propal->lire)
+		{
+			$label = '<u>' . $langs->trans("ShowPropal") . '</u>';
+			if (! empty($this->ref))
+				$label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			if (! empty($this->ref_client))
+				$label.= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+			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.'/comm/propal/card.php?id='.$this->id. $get_params;
+			}
+			if ($option == 'compta') {  // deprecated
+				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
+			}
+			if ($option == 'expedition') {
+				$url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id. $get_params;
+			}
+			if ($option == 'document') {
+				$url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id. $get_params;
+			}
 
-            if ($statut == self::STATUS_SIGNED)
-            {
-            	$trigger_name='PROPAL_CLOSE_SIGNED';
-				$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+			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';
+			}
+		}
 
-                // The connected company is classified as a client
-                $soc=new Societe($this->db);
-                $soc->id = $this->socid;
-                $result=$soc->set_as_client();
+		$linkclose='';
+		if (empty($notooltip) && $user->rights->propal->lire)
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowPropal");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+		}
 
-                if ($result < 0)
-                {
-                    $this->error=$this->db->lasterror();
-                    $this->db->rollback();
-                    return -2;
-                }
-            }
-            if ($statut == self::STATUS_BILLED)
-            {
-            	$trigger_name='PROPAL_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);
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->statut = $statut;
-            	$this->date_cloture = $now;
-            	$this->note_private = $note;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-	            // 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->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Class invoiced the Propal
-     *
-     *	@param  	User	$user    	Object user
-     *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return     int     			<0 si ko, >0 si ok
-     */
-    function classifyBilled(User $user, $notrigger=0)
-    {
-    	$error=0;
-
-    	$this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = '.self::STATUS_BILLED;
-        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (!$resql)
-        {
-        	$this->errors[]=$this->db->error();
-        	$error++;
-        }
-
-        if (! $error)
-        {
-        	$this->oldcopy= clone $this;
-        	$this->statut=self::STATUS_BILLED;
-        }
-
-        if (! $notrigger && empty($error))
-        {
-        	// Call trigger
-        	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-        	if ($result < 0) $error++;
-        	// End call triggers
-        }
-
-        if (! $error)
-        {
-        	$this->db->commit();
-        	return 1;
-        }
-        else
-        {
-        	foreach($this->errors as $errmsg)
-        	{
-        		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        		$this->error.=($this->error?', '.$errmsg:$errmsg);
-        	}
-        	$this->db->rollback();
-        	return -1*$error;
-        }
-    }
-
-    /**
-     *	Class invoiced the Propal
-     *
-     *	@return     int     	<0 si ko, >0 si ok
-     *  @deprecated
-     *  @see classifyBilled()
-     */
-    function classer_facturee()
-    {
-        global $user;
-		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
 
-    	return $this->classifyBilled($user);
-    }
-
-    /**
-     *	Set draft status
-     *
-     *	@param		User	$user		Object user that modify
-     *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return		int					<0 if KO, >0 if OK
-     */
-    function set_draft($user, $notrigger=0)
-    {
-    	$error=0;
-
-    	$this->db->begin();
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = ".self::STATUS_DRAFT;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (!$resql)
-        {
-        	$this->errors[]=$this->db->error();
-        	$error++;
-        }
-
-        if (! $error)
-        {
-        	$this->oldcopy= clone $this;
-        	$this->statut = self::STATUS_DRAFT;
-            $this->brouillon = 1;
-        }
-
-        if (! $notrigger && empty($error))
-        {
-        	// Call trigger
-        	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-        	if ($result < 0) $error++;
-        	// End call triggers
-        }
-
-        if (! $error)
-        {
-        	$this->db->commit();
-        	return 1;
-        }
-        else
-        {
-        	foreach($this->errors as $errmsg)
-        	{
-        		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        		$this->error.=($this->error?', '.$errmsg:$errmsg);
-        	}
-        	$this->db->rollback();
-        	return -1*$error;
-        }
-    }
-
-
-    /**
-     *    Return list of proposal (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.datep', $sortorder='DESC')
-    {
-        global $user;
-
-        $ga = array();
-
-        $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " p.rowid as propalid, 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."propal 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 IN (".getEntity('propal').")";
-        $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 = ".self::STATUS_DRAFT;
-        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->propalid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
-                    {
-                        $ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
-					{
-                        $ga[$i]['id']	= $obj->propalid;
-                        $ga[$i]['ref'] 	= $obj->ref;
-                        $ga[$i]['name'] = $obj->name;
-                    }
-
-                    $i++;
-                }
-            }
-            return $ga;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     *  Returns an array with the numbers of related invoices
-     *
-     *	@return	array		Array of invoices
-     */
-    function getInvoiceArrayList()
-    {
-        return $this->InvoiceArrayList($this->id);
-    }
-
-    /**
-     *  Returns an array with id and ref of related invoices
-     *
-     *	@param		int		$id			Id propal
-     *	@return		array				Array of invoices id
-     */
-    function InvoiceArrayList($id)
-    {
-        $ga = array();
-        $linkedInvoices = array();
-
-        $this->fetchObjectLinked($id,$this->element);
-        foreach($this->linkedObjectsIds as $objecttype => $objectid)
-        {
-        	// Nouveau système du comon object renvoi des rowid et non un id linéaire de 1 à n
-        	// On parcourt donc une liste d'objets en tant qu'objet unique
-			foreach($objectid as $key => $object)
-            {
-                // Cas des factures liees directement
-                if ($objecttype == 'facture')
-                {
-                    $linkedInvoices[] = $object;
-                }
-                // Cas des factures liees par un autre objet (ex: commande)
-                else
-				{
-                    $this->fetchObjectLinked($object,$objecttype);
-                    foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid)
-                    {
-						foreach($subobjectid as $subkey => $subobject)
-                        {
-                        	if ($subobjecttype == 'facture')
-                        	{
-                            	$linkedInvoices[] = $subobject;
-                        	}
-                        }
-                    }
-                }
-            }
-        }
-
-        if (count($linkedInvoices) > 0)
-        {
-            $sql= "SELECT rowid as facid, facnumber, total, datef as df, fk_user_author, fk_statut, paye";
-            $sql.= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql.= " WHERE rowid IN (".implode(',',$linkedInvoices).")";
-
-            dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-
-            if ($resql)
-            {
-                $tab_sqlobj=array();
-                $nump = $this->db->num_rows($resql);
-                for ($i = 0;$i < $nump;$i++)
-                {
-                    $sqlobj = $this->db->fetch_object($resql);
-                    $tab_sqlobj[] = $sqlobj;
-                }
-                $this->db->free($resql);
+		if ($withpicto)
+			$result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2)
+			$result.=' ';
+		$result.=$linkstart.$this->ref.$linkend;
+		return $result;
+	}
 
-                $nump = count($tab_sqlobj);
+	/**
+	 * 	Retrieve an array of propal lines
+	 *
+	 * 	@return int		>0 if OK, <0 if KO
+	 */
+	function getLinesArray()
+	{
+		// TODO Duplicate with fetch_lines ? Wich one to keep ?
 
-                if ($nump)
-                {
-                    $i = 0;
-                    while ($i < $nump)
-                    {
-                        $obj = array_shift($tab_sqlobj);
-
-                        $ga[$i] = $obj;
-
-                        $i++;
-                    }
-                }
-                return $ga;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-        else return $ga;
-    }
-
-    /**
-     *	Delete proposal
-     *
-     *	@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;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error=0;
-
-        $this->db->begin();
-
-        if (! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('PROPAL_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-
-        if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = ".$this->id;
-            if ($this->db->query($sql))
-            {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$this->id;
-                if ($this->db->query($sql))
-                {
-                    // Delete linked object
-                    $res = $this->deleteObjectLinked();
-                    if ($res < 0) $error++;
-
-                    // Delete linked contacts
-                    $res = $this->delete_linked_contact();
-                    if ($res < 0) $error++;
-
-                    if (! $error)
-                    {
-                        // We remove directory
-                        $ref = dol_sanitizeFileName($this->ref);
-                        if ($conf->propal->dir_output && !empty($this->ref))
-                        {
-                            $dir = $conf->propal->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;
-        }
-    }
-
-    /**
-     *  Change the delivery time
-     *
-     *  @param	int	$availability_id	Id of new delivery time
-     * 	@param	int	$notrigger			1=Does not execute triggers, 0= execute triggers
-     *  @return int                  	>0 if OK, <0 if KO
-     *  @deprecated  use set_availability
-     */
-    function availability($availability_id, $notrigger=0)
-    {
-        global $user;
-
-        if ($this->statut >= self::STATUS_DRAFT)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
-            $sql .= ' SET fk_availability = '.$availability_id;
-            $sql .= ' WHERE rowid='.$this->id;
-
-            dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->availability_id = $availability_id;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
-        	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
-            return -2;
-        }
-    }
-
-    /**
-     *	Change source demand
-     *
-     *	@param	int $demand_reason_id 	Id of new source demand
-     * 	@param	int	$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return int						>0 si ok, <0 si ko
-     *	@deprecated use set_demand_reason
-     */
-    function demand_reason($demand_reason_id, $notrigger=0)
-    {
-        if ($this->statut >= self::STATUS_DRAFT)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
-            $sql .= ' SET fk_input_reason = '.$demand_reason_id;
-            $sql .= ' WHERE rowid='.$this->id;
-
-            dol_syslog(__METHOD__.' demand_reason('.$demand_reason_id.')', LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->demand_reason_id = $demand_reason_id;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
-        	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
-            return -2;
-        }
-    }
-
-
-    /**
-     *	Object Proposal 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."propal 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;
-                }
+		$this->lines = array();
 
-                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, 6=Long label + Picto
-     *    	@return     string		Label
-     */
-     function LibStatut($statut,$mode=1)
-    {
-		global $langs;
-		$langs->load("propal");
+		$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
+		$sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.localtax1_tx, pt.localtax2_tx, pt.localtax1_type, pt.localtax2_type, pt.remise_percent, pt.subprice, pt.info_bits,';
+		$sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.total_localtax1, pt.total_localtax2, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code,';
+		$sql.= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,';
+		$sql.= ' pt.fk_unit,';
+		$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.description as product_desc, p.tobatch as product_tobatch,';
+		$sql.= ' p.entity,';
+		$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+		$sql.= ' WHERE pt.fk_propal = '.$this->id;
+		$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
 
-		if ($statut==self::STATUS_DRAFT) $statuttrans='statut0';
-		if ($statut==self::STATUS_VALIDATED) $statuttrans='statut1';
-		if ($statut==self::STATUS_SIGNED) $statuttrans='statut3';
-		if ($statut==self::STATUS_NOTSIGNED) $statuttrans='statut5';
-		if ($statut==self::STATUS_BILLED) $statuttrans='statut6';
+		dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 
-		if ($mode == 0)	return $this->labelstatut[$statut];
-		if ($mode == 1)	return $this->labelstatut_short[$statut];
-		if ($mode == 2)	return img_picto($this->labelstatut_short[$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 proposal to close, "signed" for proposal to invoice
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-     */
-    function load_board($user,$mode)
-    {
-        global $conf, $langs;
-
-        $clause = " WHERE";
-
-        $sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal 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 IN (".getEntity('propal').")";
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-	        $langs->load("propal");
-	        $now=dol_now();
-
-            if ($mode == 'opened') {
-	            $delay_warning=$conf->propal->cloture->warning_delay;
-	            $statut = self::STATUS_VALIDATED;
-	            $label = $langs->trans("PropalsToClose");
-            }
-            if ($mode == 'signed') {
-	            $delay_warning=$conf->propal->facturation->warning_delay;
-	            $statut = self::STATUS_SIGNED;
-	            $label = $langs->trans("PropalsToBill");         // We set here bill but may be billed or ordered
-            }
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay = $delay_warning/60/60/24;
-	        $response->label = $label;
-	        $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
-	        $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
-	        $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->error();
-            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 $langs;
-
-        // 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->ref_client='NEMICEPS';
-        $this->specimen=1;
-        $this->socid = 1;
-        $this->date = time();
-        $this->fin_validite = $this->date+3600*24*30;
-        $this->cond_reglement_id   = 1;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_id   = 7;
-        $this->mode_reglement_code = 'CHQ';
-        $this->availability_id     = 1;
-        $this->availability_code   = 'AV_NOW';
-        $this->demand_reason_id    = 1;
-        $this->demand_reason_code  = 'SRC_00';
-        $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 PropaleLigne($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=20;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
-            if ($xnbp == 2)
-            {
-                $line->total_ht=50;
-                $line->total_ttc=60;
-                $line->total_tva=10;
-                $line->remise_percent=50;
-            }
-            else
-            {
-                $line->total_ht=100;
-                $line->total_ttc=120;
-                $line->total_tva=20;
-                $line->remise_percent=00;
-            }
-
-            if ($num_prods > 0)
-            {
-            	$prodid = mt_rand(1, $num_prods);
-            	$line->fk_product=$prodids[$prodid];
-		$line->product_ref='SPECIMEN';
-            }
-
-            $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 $user;
-
-        $this->nb=array();
-        $clause = "WHERE";
-
-        $sql = "SELECT count(p.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal 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 IN (".getEntity('propal').")";
-
-        $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["proposals"]=$obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Returns the reference to the following non used Proposal used depending on the active numbering module
-     *  defined into PROPALE_ADDON
-     *
-     *  @param	Societe		$soc  	Object thirdparty
-     *  @return string      		Reference libre pour la propale
-     */
-    function getNextNumRef($soc)
-    {
-        global $conf,$langs;
-        $langs->load("propal");
-
-        if (! empty($conf->global->PROPALE_ADDON))
-        {
-        	$mybool=false;
-
-            $file = $conf->global->PROPALE_ADDON.".php";
-            $classname = $conf->global->PROPALE_ADDON;
-
-            // Include file with class
-            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-            foreach ($dirmodels as $reldir) {
-
-                $dir = dol_buildpath($reldir."core/modules/propale/");
-
-                // 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;
-                //dol_print_error($db,"Propale::getNextNumRef ".$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 ('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
-
-        $result='';
-        $label='';
-        $url='';
-
-        if ($user->rights->propal->lire)
-        {
-            $label = '<u>' . $langs->trans("ShowPropal") . '</u>';
-            if (! empty($this->ref))
-                $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            if (! empty($this->ref_client))
-                $label.= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-            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.'/comm/propal/card.php?id='.$this->id. $get_params;
-            }
-            if ($option == 'compta') {  // deprecated
-                $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
-            }
-            if ($option == 'expedition') {
-                $url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id. $get_params;
-            }
-            if ($option == 'document') {
-                $url = DOL_URL_ROOT.'/comm/propal/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("ShowPropal");
-                $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>';
-
-        if ($withpicto)
-            $result.=($linkstart.img_object(($notooltip?'':$label), $this->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 propal lines
-	 *
-	 * 	@return int		>0 if OK, <0 if KO
-     */
-    function getLinesArray()
-    {
-        // TODO Duplicate with fetch_lines ? Wich one to keep ?
-
-        $this->lines = array();
-
-        $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-        $sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.localtax1_tx, pt.localtax2_tx, pt.localtax1_type, pt.localtax2_type, pt.remise_percent, pt.subprice, pt.info_bits,';
-        $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.total_localtax1, pt.total_localtax2, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code,';
-        $sql.= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,';
-	    $sql.= ' pt.fk_unit,';
-        $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.description as product_desc, p.tobatch as product_tobatch,';
-        $sql.= ' p.entity,';
-		$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-        $sql.= ' WHERE pt.fk_propal = '.$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 PropaleLigne($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]->desc       		= $obj->description;
-                $this->lines[$i]->description 		= $obj->description;
-                $this->lines[$i]->fk_product		= $obj->fk_product;
-                $this->lines[$i]->ref				= $obj->ref;
-                $this->lines[$i]->product_ref		= $obj->ref;
-                $this->lines[$i]->entity            = $obj->entity;             // Product entity
-                $this->lines[$i]->product_label		= $obj->product_label;
-                $this->lines[$i]->product_desc		= $obj->product_desc;
-                $this->lines[$i]->product_tobatch   = $obj->product_tobatch;
-                $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]->vat_src_code      = $obj->vat_src_code;
-                $this->lines[$i]->tva_tx			= $obj->tva_tx;
-                $this->lines[$i]->localtax1_tx		= $obj->localtax1_tx;
-                $this->lines[$i]->localtax2_tx		= $obj->localtax2_tx;
-                $this->lines[$i]->localtax1_type	= $obj->localtax1_type;
-                $this->lines[$i]->localtax2_type	= $obj->localtax2_type;
-                $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]->total_localtax1	= $obj->total_localtax1;
-                $this->lines[$i]->total_localtax2	= $obj->total_localtax2;
-                $this->lines[$i]->fk_fournprice		= $obj->fk_fournprice;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->lines[$i]					= new PropaleLigne($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]->desc       		= $obj->description;
+				$this->lines[$i]->description 		= $obj->description;
+				$this->lines[$i]->fk_product		= $obj->fk_product;
+				$this->lines[$i]->ref				= $obj->ref;
+				$this->lines[$i]->product_ref		= $obj->ref;
+				$this->lines[$i]->entity            = $obj->entity;             // Product entity
+				$this->lines[$i]->product_label		= $obj->product_label;
+				$this->lines[$i]->product_desc		= $obj->product_desc;
+				$this->lines[$i]->product_tobatch   = $obj->product_tobatch;
+				$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]->vat_src_code      = $obj->vat_src_code;
+				$this->lines[$i]->tva_tx			= $obj->tva_tx;
+				$this->lines[$i]->localtax1_tx		= $obj->localtax1_tx;
+				$this->lines[$i]->localtax2_tx		= $obj->localtax2_tx;
+				$this->lines[$i]->localtax1_type	= $obj->localtax1_type;
+				$this->lines[$i]->localtax2_type	= $obj->localtax2_type;
+				$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]->total_localtax1	= $obj->total_localtax1;
+				$this->lines[$i]->total_localtax2	= $obj->total_localtax2;
+				$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]->date_start		= $this->db->jdate($obj->date_start);
-                $this->lines[$i]->date_end			= $this->db->jdate($obj->date_end);
-	            $this->lines[$i]->fk_unit			= $obj->fk_unit;
+				$this->lines[$i]->special_code		= $obj->special_code;
+				$this->lines[$i]->rang				= $obj->rang;
+				$this->lines[$i]->date_start		= $this->db->jdate($obj->date_start);
+				$this->lines[$i]->date_end			= $this->db->jdate($obj->date_end);
+				$this->lines[$i]->fk_unit			= $obj->fk_unit;
 
 				// Multicurrency
 				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
@@ -3444,18 +3444,18 @@ 
 				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-                $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.
@@ -3513,16 +3513,16 @@ 
  */
 class PropaleLigne extends CommonObjectLine
 {
-    public $element='propaldet';
-    public $table_element='propaldet';
+	public $element='propaldet';
+	public $table_element='propaldet';
 
-    var $oldline;
+	var $oldline;
 
-    // From llx_propaldet
-    var $fk_propal;
-    var $fk_parent_line;
-    var $desc;          	// Description ligne
-    var $fk_product;		// Id produit predefini
+	// From llx_propaldet
+	var $fk_propal;
+	var $fk_parent_line;
+	var $desc;          	// Description ligne
+	var $fk_product;		// Id produit predefini
 	/**
 	 * @deprecated
 	 * @see product_type
@@ -3533,51 +3533,51 @@ 
 	 * @var int
 	 * @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
 	 */
-    var $product_type = Product::TYPE_PRODUCT;
+	var $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
 	 */
-    var $ref;
+	var $ref;
 	/**
 	 * Product reference
 	 * @var string
@@ -3587,7 +3587,7 @@ 
 	 * @deprecated
 	 * @see product_label
 	 */
-    var $libelle;
+	var $libelle;
 	/**
 	 *  Product label
 	 * @var string
@@ -3597,21 +3597,21 @@ 
 	 * Product description
 	 * @var string
 	 */
-    public $product_desc;
+	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 $date_start;
-    var $date_end;
+	var $date_start;
+	var $date_end;
 
-    var $skip_update_total; // Skip update price total for special lines
+	var $skip_update_total; // Skip update price total for special lines
 
-    // Multicurrency
+	// Multicurrency
 	var $fk_multicurrency;
 	var $multicurrency_code;
 	var $multicurrency_subprice;
@@ -3619,22 +3619,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_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, pd.tva_tx,';
@@ -3694,7 +3694,7 @@ 
 			$this->fk_unit          = $objp->fk_unit;
 
 			$this->date_start       = $this->db->jdate($objp->date_start);
-            $this->date_end         = $this->db->jdate($objp->date_end);
+			$this->date_end         = $this->db->jdate($objp->date_end);
 
 			// Multicurrency
 			$this->fk_multicurrency 		= $objp->fk_multicurrency;
@@ -3706,7 +3706,7 @@ 
 
 			$this->db->free($result);
 
-            return 1;
+			return 1;
 		}
 		else
 		{
@@ -3714,45 +3714,45 @@ 
 		}
 	}
 
-    /**
-     *  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,$user;
+	/**
+	 *  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,$user;
 
-        $error=0;
+		$error=0;
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang);
+		dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
-        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->localtax1_type)) $this->localtax1_type=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->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) || ! is_numeric($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->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) || ! is_numeric($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 (! is_numeric($this->qty)) $this->qty = 0;
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+		if (empty($this->pa_ht)) $this->pa_ht=0;
+		if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice=0;
+		if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht=0;
+		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
+		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
 
-       // if buy price not defined, define buyprice as configured in margin admin
+	   // if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
@@ -3765,183 +3765,183 @@ 
 			}
 		}
 
-        // 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.'propaldet';
-        $sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
+		// Insert line into database
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet';
+		$sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
 		$sql.= ' fk_remise_except, qty, vat_src_code, 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.= ' fk_unit,';
-        $sql.= ' date_start, date_end';
+		$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.= ' fk_unit,';
+		$sql.= ' date_start, date_end';
 		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
-        $sql.= " VALUES (".$this->fk_propal.",";
-        $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.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql.= " ".price2num($this->tva_tx).",";
-        $sql.= " ".price2num($this->localtax1_tx).",";
-        $sql.= " ".price2num($this->localtax2_tx).",";
+		$sql.= " VALUES (".$this->fk_propal.",";
+		$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.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+		$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.= " ".($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->fk_unit ? 'NULL' : $this->fk_unit).',';
-        $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
-        $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+		$sql.= " ".($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->fk_unit ? 'NULL' : $this->fk_unit).',';
+		$sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
+		$sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
 		$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.= ')';
-
-        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.'propaldet');
-
-            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('LINEPROPAL_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
-     *
-     *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return	 int  <0 if ko, >0 if ok
-     */
-    function delete($notrigger=0)
-    {
-        global $conf,$user;
-
-        $error=0;
-        $this->db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
-        dol_syslog("PropaleLigne::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);
-        		}
-        	}
-
-        	if (! $error && ! $notrigger)
-        	{
-	            // Call trigger
-	            $result=$this->call_trigger('LINEPROPAL_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,$user;
-
-        $error=0;
-
-        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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;
+		$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.'propaldet');
+
+			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('LINEPROPAL_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
+	 *
+	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return	 int  <0 if ko, >0 if ok
+	 */
+	function delete($notrigger=0)
+	{
+		global $conf,$user;
+
+		$error=0;
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
+		dol_syslog("PropaleLigne::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);
+				}
+			}
+
+			if (! $error && ! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINEPROPAL_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,$user;
+
+		$error=0;
+
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->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->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
@@ -3957,119 +3957,119 @@ 
 			}
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet 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;
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propaldet 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.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
-        $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
-        $sql.= ", localtax1_tx=".price2num($this->localtax1_tx);
-        $sql.= ", localtax2_tx=".price2num($this->localtax2_tx);
+		$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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-        $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-	    $sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
+		$sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+		$sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
 		// 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.= " 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('LINEPROPAL_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."propaldet 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("PropaleLigne::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;
-        }
-    }
+		$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('LINEPROPAL_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."propaldet 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("PropaleLigne::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 +1050 added lines, -1050 removed lines

@@ -32,24 +32,24 @@ 
  *	\brief      File of class to manage proposals
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.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.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.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 proposals
  */
 class Propal extends CommonObject
 {
-    public $element='propal';
-    public $table_element='propal';
-    public $table_element_line='propaldet';
-    public $fk_element='fk_propal';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='propal';
+    public $element = 'propal';
+    public $table_element = 'propal';
+    public $table_element_line = 'propaldet';
+    public $fk_element = 'fk_propal';
+    protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    public $picto = 'propal';
 
     /**
      * {@inheritdoc}
@@ -144,8 +144,8 @@ 
     public $demand_reason_id;
     public $demand_reason_code;
 
-    public $products=array();
-    public $extraparams=array();
+    public $products = array();
+    public $extraparams = array();
 
 	/**
 	 * @var PropaleLigne[]
@@ -153,8 +153,8 @@ 
     public $lines = array();
     public $line;
 
-    public $labelstatut=array();
-    public $labelstatut_short=array();
+    public $labelstatut = array();
+    public $labelstatut_short = array();
 
     public $specimen;
 
@@ -187,7 +187,7 @@ 
 	/**
 	 * Billed or processed quote
 	 */
-	const STATUS_BILLED = 4;   // Todo rename into STATUS_CLOSE ?
+	const STATUS_BILLED = 4; // Todo rename into STATUS_CLOSE ?
 
     /**
      *	Constructor
@@ -196,9 +196,9 @@ 
      *	@param      int		$socid		Id third party
      *	@param      int		$propalid   Id proposal
      */
-    function __construct($db, $socid="", $propalid=0)
+    function __construct($db, $socid = "", $propalid = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         $this->db = $db;
         $this->socid = $socid;
@@ -208,19 +208,19 @@ 
         $this->remise_percent = 0;
         $this->remise_absolue = 0;
 
-        $this->duree_validite=$conf->global->PROPALE_VALIDITY_DURATION;
+        $this->duree_validite = $conf->global->PROPALE_VALIDITY_DURATION;
 
         $langs->load("propal");
-        $this->labelstatut[0]=(! empty($conf->global->PROPAL_STATUS_DRAFT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFT_LABEL : $langs->trans("PropalStatusDraft"));
-        $this->labelstatut[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATED_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATED_LABEL : $langs->trans("PropalStatusValidated"));
-        $this->labelstatut[2]=(! empty($conf->global->PROPAL_STATUS_SIGNED_LABEL) ? $conf->global->PROPAL_STATUS_SIGNED_LABEL : $langs->trans("PropalStatusSigned"));
-        $this->labelstatut[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNED_LABEL : $langs->trans("PropalStatusNotSigned"));
-        $this->labelstatut[4]=(! empty($conf->global->PROPAL_STATUS_BILLED_LABEL) ? $conf->global->PROPAL_STATUS_BILLED_LABEL : $langs->trans("PropalStatusBilled"));
-        $this->labelstatut_short[0]=(! empty($conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("PropalStatusDraftShort"));
-        $this->labelstatut_short[1]=(! empty($conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
-        $this->labelstatut_short[2]=(! empty($conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("PropalStatusSignedShort"));
-        $this->labelstatut_short[3]=(! empty($conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("PropalStatusNotSignedShort"));
-        $this->labelstatut_short[4]=(! empty($conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("PropalStatusBilledShort"));
+        $this->labelstatut[0] = (!empty($conf->global->PROPAL_STATUS_DRAFT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFT_LABEL : $langs->trans("PropalStatusDraft"));
+        $this->labelstatut[1] = (!empty($conf->global->PROPAL_STATUS_VALIDATED_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATED_LABEL : $langs->trans("PropalStatusValidated"));
+        $this->labelstatut[2] = (!empty($conf->global->PROPAL_STATUS_SIGNED_LABEL) ? $conf->global->PROPAL_STATUS_SIGNED_LABEL : $langs->trans("PropalStatusSigned"));
+        $this->labelstatut[3] = (!empty($conf->global->PROPAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNED_LABEL : $langs->trans("PropalStatusNotSigned"));
+        $this->labelstatut[4] = (!empty($conf->global->PROPAL_STATUS_BILLED_LABEL) ? $conf->global->PROPAL_STATUS_BILLED_LABEL : $langs->trans("PropalStatusBilled"));
+        $this->labelstatut_short[0] = (!empty($conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->PROPAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("PropalStatusDraftShort"));
+        $this->labelstatut_short[1] = (!empty($conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
+        $this->labelstatut_short[2] = (!empty($conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("PropalStatusSignedShort"));
+        $this->labelstatut_short[3] = (!empty($conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("PropalStatusNotSignedShort"));
+        $this->labelstatut_short[4] = (!empty($conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->PROPAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("PropalStatusBilledShort"));
     }
 
 
@@ -236,30 +236,30 @@ 
      *	TODO	Replace calls to this function by generation objet Ligne
      *			inserted into table $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;
-            $vat_src_code = '';     // May be defined into tva_tx
+            $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;
+            $vat_src_code = ''; // May be defined into tva_tx
 
-            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
-            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
+            $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
+            $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
 
             // multiprices
-            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];
             }
@@ -270,17 +270,17 @@ 
 
             $line = new PropaleLigne($this->db);
 
-            $line->fk_product=$idproduct;
-            $line->desc=$productdesc;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->vat_src_code=$vat_src_code;
-            $line->tva_tx=$tva_tx;
-	        $line->fk_unit=$prod->fk_unit;
+            $line->fk_product = $idproduct;
+            $line->desc = $productdesc;
+            $line->qty = $qty;
+            $line->subprice = $price;
+            $line->remise_percent = $remise_percent;
+            $line->vat_src_code = $vat_src_code;
+            $line->tva_tx = $tva_tx;
+	        $line->fk_unit = $prod->fk_unit;
 			if ($tva_npr) $line->info_bits = 1;
 
-            $this->lines[]=$line;
+            $this->lines[] = $line;
         }
     }
 
@@ -299,46 +299,46 @@ 
 
         $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;
             }
 
-            $line=new PropaleLigne($this->db);
+            $line = new PropaleLigne($this->db);
 
             $this->line->context = $this->context;
 
-            $line->fk_propal=$this->id;
-            $line->fk_remise_except=$remise->id;
-            $line->desc=$remise->description;   	// Description ligne
-            $line->vat_src_code=$remise->vat_src_code;
-            $line->tva_tx=$remise->tva_tx;
-            $line->subprice=-$remise->amount_ht;
-            $line->fk_product=0;					// Id produit predefined
-            $line->qty=1;
-            $line->remise=0;
-            $line->remise_percent=0;
-            $line->rang=-1;
-            $line->info_bits=2;
+            $line->fk_propal = $this->id;
+            $line->fk_remise_except = $remise->id;
+            $line->desc = $remise->description; // Description ligne
+            $line->vat_src_code = $remise->vat_src_code;
+            $line->tva_tx = $remise->tva_tx;
+            $line->subprice = -$remise->amount_ht;
+            $line->fk_product = 0; // Id produit predefined
+            $line->qty = 1;
+            $line->remise = 0;
+            $line->remise_percent = 0;
+            $line->rang = -1;
+            $line->info_bits = 2;
 
             // TODO deprecated
-            $line->price=-$remise->amount_ht;
+            $line->price = -$remise->amount_ht;
 
             $line->total_ht  = -$remise->amount_ht;
             $line->total_tva = -$remise->amount_tva;
             $line->total_ttc = -$remise->amount_ttc;
 
-            $result=$line->insert();
+            $result = $line->insert();
             if ($result > 0)
             {
-                $result=$this->update_price(1);
+                $result = $this->update_price(1);
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -352,7 +352,7 @@ 
             }
             else
             {
-                $this->error=$line->error;
+                $this->error = $line->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -400,7 +400,7 @@ 
      *    	@return    	int         	    			>0 if OK, <0 if KO
      *    	@see       	add_product
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise=0, $fk_remise_except=0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
     {
     	global $mysoc, $conf, $langs;
 
@@ -408,27 +408,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);               // $txtva can have format '5.0(XXX)' or '5'
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-    	$pa_ht=price2num($pa_ht);
-        if ($price_base_type=='HT')
-        {
-            $pu=$pu_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); // $txtva can have format '5.0(XXX)' or '5'
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
+    	$pa_ht = price2num($pa_ht);
+        if ($price_base_type == 'HT')
+        {
+            $pu = $pu_ht;
         }
         else
         {
-            $pu=$pu_ttc;
+            $pu = $pu_ttc;
         }
 
         // Check parameters
@@ -438,16 +438,16 @@ 
         {
             $this->db->begin();
 
-        	$product_type=$type;
+        	$product_type = $type;
 			if (!empty($fk_product))
 			{
-				$product=new Product($this->db);
-				$result=$product->fetch($fk_product);
-				$product_type=$product->type;
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
 
-				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_PROPOSAL) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_PROPOSAL) && $product_type == 0 && $product->stock_reel < $qty) {
                     $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnProposal', $product->ref);
+				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnProposal', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -458,17 +458,17 @@ 
             // 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);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
             // Clean vat code
-            $vat_src_code='';
+            $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg))
             {
                 $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $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, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
 
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
@@ -480,7 +480,7 @@ 
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
@@ -504,39 +504,39 @@ 
             }
 
             // Insert line
-            $this->line=new PropaleLigne($this->db);
+            $this->line = new PropaleLigne($this->db);
 
             $this->line->context = $this->context;
 
-            $this->line->fk_propal=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
+            $this->line->fk_propal = $this->id;
+            $this->line->label = $label;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
 
-			$this->line->vat_src_code=$vat_src_code;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$txlocaltax1;
-            $this->line->localtax2_tx=$txlocaltax2;
+			$this->line->vat_src_code = $vat_src_code;
+            $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->product_type=$type;
-            $this->line->fk_remise_except=$fk_remise_except;
-            $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->special_code=$special_code;
-            $this->line->fk_parent_line=$fk_parent_line;
-            $this->line->fk_unit=$fk_unit;
-
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+            $this->line->fk_product = $fk_product;
+            $this->line->product_type = $type;
+            $this->line->fk_remise_except = $fk_remise_except;
+            $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->special_code = $special_code;
+            $this->line->fk_parent_line = $fk_parent_line;
+            $this->line->fk_unit = $fk_unit;
+
+            $this->line->date_start = $date_start;
+            $this->line->date_end = $date_end;
 
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
@@ -545,32 +545,32 @@ 
             $this->line->origin = $origin;
 
 			// 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		= $pu_ht_devise;
 			$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_options) && count($array_options)>0) {
-            	$this->line->array_options=$array_options;
+            if (is_array($array_options) && count($array_options) > 0) {
+            	$this->line->array_options = $array_options;
             }
 
-            $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,$mysoc);	// 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, $mysoc); // 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();
@@ -578,14 +578,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;
             }
@@ -621,7 +621,7 @@ 
 	 * 	@param		int			$notrigger			disable line update trigger
      *  @return     int     		        		0 if OK, <0 if KO
      */
-	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.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, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0)
+	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.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, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
     {
         global $mysoc;
 
@@ -630,16 +630,16 @@ 
         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
-        if (empty($type)) $type=0;
+        $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($type)) $type = 0;
 
         if ($this->statut == self::STATUS_DRAFT)
         {
@@ -650,17 +650,17 @@ 
             // 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);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
             // Clean vat code
-            $vat_src_code='';
+            $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg))
             {
                 $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $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, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -671,7 +671,7 @@ 
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
@@ -696,7 +696,7 @@ 
             $this->line->context = $this->context;
 
             // 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;
@@ -704,16 +704,16 @@ 
 
             $this->line->rowid				= $rowid;
             $this->line->label				= $label;
-            $this->line->desc				= $desc;
-            $this->line->qty				= $qty;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
             $this->line->product_type		= $type;
             $this->line->vat_src_code		= $vat_src_code;
-            $this->line->tva_tx				= $txtva;
+            $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_ht;
             $this->line->info_bits			= $info_bits;
 
@@ -722,23 +722,23 @@ 
             $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->fk_unit	= $fk_unit;
+            $this->line->skip_update_total = $skip_update_total;
+            $this->line->fk_unit = $fk_unit;
 
 			$this->line->fk_fournprice = $fk_fournprice;
             $this->line->pa_ht = $pa_ht;
 
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+            $this->line->date_start = $date_start;
+            $this->line->date_end = $date_end;
 
             // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+            $this->line->price = $price;
+            $this->line->remise = $remise;
 
-            if (is_array($array_options) && count($array_options)>0) {
-            	$this->line->array_options=$array_options;
+            if (is_array($array_options) && count($array_options) > 0) {
+            	$this->line->array_options = $array_options;
             }
 
 			// Multicurrency
@@ -747,11 +747,11 @@ 
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $result=$this->line->update($notrigger);
+            $result = $this->line->update($notrigger);
             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);
 
@@ -763,7 +763,7 @@ 
             }
             else
             {
-                $this->error=$this->line->error;
+                $this->error = $this->line->error;
 
                 $this->db->rollback();
                 return -1;
@@ -787,7 +787,7 @@ 
     {
         if ($this->statut == self::STATUS_DRAFT)
         {
-            $line=new PropaleLigne($this->db);
+            $line = new PropaleLigne($this->db);
 
             // For triggers
             $line->fetch($lineid);
@@ -818,21 +818,21 @@ 
      * 	@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 $conf,$hookmanager;
-        $error=0;
+        global $conf, $hookmanager;
+        $error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Clean parameters
-        if (empty($this->date)) $this->date=$this->datep;
+        if (empty($this->date)) $this->date = $this->datep;
         $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
-        if (empty($this->availability_id)) $this->availability_id=0;
-        if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
+        if (empty($this->availability_id)) $this->availability_id = 0;
+        if (empty($this->demand_reason_id)) $this->demand_reason_id = 0;
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -843,22 +843,22 @@ 
         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;
 			}
@@ -866,7 +866,7 @@ 
 
         if (empty($this->date))
         {
-            $this->error="Date of proposal is required";
+            $this->error = "Date of proposal is required";
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -4;
         }
@@ -876,94 +876,94 @@ 
 
         // Insert into database
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
-        $sql.= "fk_soc";
-        $sql.= ", price";
-        $sql.= ", remise";
-        $sql.= ", remise_percent";
-        $sql.= ", remise_absolue";
-        $sql.= ", tva";
-        $sql.= ", total";
-        $sql.= ", datep";
-        $sql.= ", datec";
-        $sql.= ", ref";
-        $sql.= ", fk_user_author";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", model_pdf";
-        $sql.= ", fin_validite";
-        $sql.= ", fk_cond_reglement";
-        $sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", ref_client";
-        $sql.= ", date_livraison";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_availability";
-        $sql.= ", fk_input_reason";
-        $sql.= ", fk_projet";
-        $sql.= ", fk_incoterms";
-        $sql.= ", location_incoterms";
-        $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($this->date)."'";
-        $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->fin_validite!=''?"'".$this->db->idate($this->fin_validite)."'":"NULL");
-        $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-        $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", '".$this->db->escape($this->ref_client)."'";
-        $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"NULL");
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".$this->availability_id;
-        $sql.= ", ".$this->demand_reason_id;
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-        $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 .= ", datep";
+        $sql .= ", datec";
+        $sql .= ", ref";
+        $sql .= ", fk_user_author";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", model_pdf";
+        $sql .= ", fin_validite";
+        $sql .= ", fk_cond_reglement";
+        $sql .= ", fk_mode_reglement";
+        $sql .= ", fk_account";
+        $sql .= ", ref_client";
+        $sql .= ", date_livraison";
+        $sql .= ", fk_shipping_method";
+        $sql .= ", fk_availability";
+        $sql .= ", fk_input_reason";
+        $sql .= ", fk_projet";
+        $sql .= ", fk_incoterms";
+        $sql .= ", location_incoterms";
+        $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($this->date)."'";
+        $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->fin_validite != '' ? "'".$this->db->idate($this->fin_validite)."'" : "NULL");
+        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
+        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", '".$this->db->escape($this->ref_client)."'";
+        $sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "NULL");
+        $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+        $sql .= ", ".$this->availability_id;
+        $sql .= ", ".$this->demand_reason_id;
+        $sql .= ", ".($this->fk_project ? $this->fk_project : "null");
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+        $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."propal");
 
             if ($this->id)
             {
-                $this->ref='(PROV'.$this->id.')';
+                $this->ref = '(PROV'.$this->id.')';
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."propal 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 line that are not child lines or special product
                         if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
@@ -1000,7 +1000,7 @@ 
                         if ($result < 0)
                         {
                             $error++;
-                            $this->error=$this->db->error;
+                            $this->error = $this->db->error;
                             dol_print_error($this->db);
                             break;
                         }
@@ -1012,41 +1012,41 @@ 
                 }
 
                 // 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);
                 }
 
                 // Set delivery address
-                if (! $error && $this->fk_delivery_address)
+                if (!$error && $this->fk_delivery_address)
                 {
                     $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-                    $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
-                    $sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
-                    $sql.= " AND entity = ".$conf->entity;
+                    $sql .= " SET fk_delivery_address = ".$this->fk_delivery_address;
+                    $sql .= " WHERE ref = '".$this->db->escape($this->ref)."'";
+                    $sql .= " AND entity = ".$conf->entity;
 
-                    $result=$this->db->query($sql);
+                    $result = $this->db->query($sql);
                 }
 
-                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)
                     	// TODO le hook fait double emploi avec le trigger !!
                     	$hookmanager->initHooks(array('propaldao'));
-                    	$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++;
@@ -1055,28 +1055,28 @@ 
                     	}
                     	else if ($reshook < 0) $error++;
 
-                        if (! $notrigger)
+                        if (!$notrigger)
                         {
                             // Call trigger
-                            $result=$this->call_trigger('PROPAL_CREATE',$user);
+                            $result = $this->call_trigger('PROPAL_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);
@@ -1090,7 +1090,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -1107,7 +1107,7 @@ 
     function create_from($user)
     {
     	// i love this function because $this->products is not used in create function...
-        $this->products=$this->lines;
+        $this->products = $this->lines;
 
         return $this->create($user);
     }
@@ -1118,37 +1118,37 @@ 
      *		@param		int				$socid			Id of thirdparty
      * 	 	@return		int								New id of clone
      */
-    function createFromClone($socid=0)
+    function createFromClone($socid = 0)
     {
-        global $user,$conf,$hookmanager;
+        global $user, $conf, $hookmanager;
 
 		dol_include_once('/projet/class/project.class.php');
 
-        $this->context['createfromclone']='createfromclone';
+        $this->context['createfromclone'] = 'createfromclone';
 
-        $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 dest object
         $clonedObj = clone $this;
 
-        $objsoc=new Societe($this->db);
+        $objsoc = new Societe($this->db);
 
         // Change socid if needed
-        if (! empty($socid) && $socid != $clonedObj->socid)
+        if (!empty($socid) && $socid != $clonedObj->socid)
         {
             if ($objsoc->fetch($socid) > 0)
             {
-                $clonedObj->socid 				= $objsoc->id;
-                $clonedObj->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                $clonedObj->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $clonedObj->fk_delivery_address	= '';
+                $clonedObj->socid = $objsoc->id;
+                $clonedObj->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+                $clonedObj->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+                $clonedObj->fk_delivery_address = '';
 
                 /*if (!empty($conf->projet->enabled))
                 {
@@ -1160,11 +1160,11 @@ 
     					$clonedObj->fk_project = '';
     				}
                 }*/
-                $clonedObj->fk_project = '';    // A cloned proposal is set by default to no project.
+                $clonedObj->fk_project = ''; // A cloned proposal is set by default to no project.
             }
 
             // reset ref_client
-            $clonedObj->ref_client  = '';
+            $clonedObj->ref_client = '';
 
             // TODO Change product price if multi-prices
         }
@@ -1173,21 +1173,21 @@ 
             $objsoc->fetch($clonedObj->socid);
         }
 
-        $clonedObj->id=0;
-        $clonedObj->ref='';
-        $clonedObj->statut=self::STATUS_DRAFT;
+        $clonedObj->id = 0;
+        $clonedObj->ref = '';
+        $clonedObj->statut = self::STATUS_DRAFT;
 
         // Clear fields
-        $clonedObj->user_author	= $user->id;
-        $clonedObj->user_valid	= '';
-        $clonedObj->date		= $now;
-        $clonedObj->datep		= $now;    // deprecated
-        $clonedObj->fin_validite	= $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
-        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $clonedObj->ref_client	= '';
+        $clonedObj->user_author = $user->id;
+        $clonedObj->user_valid = '';
+        $clonedObj->date = $now;
+        $clonedObj->datep = $now; // deprecated
+        $clonedObj->fin_validite = $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
+        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $clonedObj->ref_client = '';
 
         // Create clone
 
-        $result=$clonedObj->create($user);
+        $result = $clonedObj->create($user);
         if ($result < 0) $error++;
         else
         {
@@ -1203,19 +1203,19 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             // Hook of thirdparty module
             if (is_object($hookmanager))
             {
-                $parameters=array('objFrom'=>$this,'clonedObj'=>$clonedObj);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$clonedObj,$action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('objFrom'=>$this, 'clonedObj'=>$clonedObj);
+                $action = '';
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
 
             // Call trigger
-            $result=$clonedObj->call_trigger('PROPAL_CLONE',$user);
+            $result = $clonedObj->call_trigger('PROPAL_CLONE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
@@ -1223,7 +1223,7 @@ 
         unset($this->context['createfromclone']);
 
         // End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $clonedObj->id;
@@ -1242,48 +1242,48 @@ 
      *	@param		string		$ref		Ref of proposal
      *	@return     int         			>0 if OK, <0 if KO
      */
-    function fetch($rowid,$ref='')
+    function fetch($rowid, $ref = '')
     {
 
         $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.datep as dp";
-        $sql.= ", p.fin_validite as dfv";
-        $sql.= ", p.date_livraison as date_livraison";
-        $sql.= ", p.model_pdf, p.ref_client, 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_delivery_address";
-        $sql.= ", p.fk_availability";
-        $sql.= ", p.fk_input_reason";
-        $sql.= ", p.fk_cond_reglement";
-        $sql.= ", p.fk_mode_reglement";
-        $sql.= ', p.fk_account';
-        $sql.= ", p.fk_shipping_method";
-        $sql.= ", p.fk_incoterms, p.location_incoterms";
-		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
-        $sql.= ", i.libelle as libelle_incoterms";
-        $sql.= ", c.label as statut_label";
-        $sql.= ", ca.code as availability_code, ca.label as availability";
-        $sql.= ", dr.code as demand_reason_code, dr.label as demand_reason";
-        $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."propal 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.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
-        $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity IN (".getEntity('propal').")";
-        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.datep as dp";
+        $sql .= ", p.fin_validite as dfv";
+        $sql .= ", p.date_livraison as date_livraison";
+        $sql .= ", p.model_pdf, p.ref_client, 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_delivery_address";
+        $sql .= ", p.fk_availability";
+        $sql .= ", p.fk_input_reason";
+        $sql .= ", p.fk_cond_reglement";
+        $sql .= ", p.fk_mode_reglement";
+        $sql .= ', p.fk_account';
+        $sql .= ", p.fk_shipping_method";
+        $sql .= ", p.fk_incoterms, p.location_incoterms";
+		$sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
+        $sql .= ", i.libelle as libelle_incoterms";
+        $sql .= ", c.label as statut_label";
+        $sql .= ", ca.code as availability_code, ca.label as availability";
+        $sql .= ", dr.code as demand_reason_code, dr.label as demand_reason";
+        $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."propal 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 .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
+        $sql .= " WHERE p.fk_statut = c.id";
+        $sql .= " AND p.entity IN (".getEntity('propal').")";
+        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))
@@ -1314,31 +1314,31 @@ 
 
                 $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                 = $this->db->jdate($obj->dp);	// Proposal date
-                $this->datep                = $this->db->jdate($obj->dp);    // deprecated
+                $this->date_creation = $this->db->jdate($obj->datec); //Creation date
+                $this->date_validation = $this->db->jdate($obj->datev); //Validation date
+                $this->date                 = $this->db->jdate($obj->dp); // Proposal date
+                $this->datep                = $this->db->jdate($obj->dp); // deprecated
                 $this->fin_validite         = $this->db->jdate($obj->dfv);
                 $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->availability_id      = $obj->fk_availability;
                 $this->availability_code    = $obj->availability_code;
                 $this->availability         = $obj->availability;
                 $this->demand_reason_id     = $obj->fk_input_reason;
                 $this->demand_reason_code   = $obj->demand_reason_code;
                 $this->demand_reason        = $obj->demand_reason;
-                $this->fk_address  			= $obj->fk_delivery_address;
+                $this->fk_address = $obj->fk_delivery_address;
 
                 $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;
@@ -1351,9 +1351,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;
 
@@ -1365,9 +1365,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);
 
@@ -1376,7 +1376,7 @@ 
                 /*
                  * Lines
                  */
-                $result=$this->fetch_lines();
+                $result = $this->fetch_lines();
                 if ($result < 0)
                 {
                     return -3;
@@ -1385,12 +1385,12 @@ 
                 return 1;
             }
 
-            $this->error="Record Not Found";
+            $this->error = "Record Not Found";
             return 0;
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -1401,21 +1401,21 @@ 
 	 * @param		int		$only_product	Return only physical products
 	 * @return		int						<0 if KO, >0 if OK
 	 */
-	function fetch_lines($only_product=0)
+	function fetch_lines($only_product = 0)
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, 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.= ' d.fk_unit,';
-		$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-		$sql.= ' d.date_start, d.date_end';
-		$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
-		$sql.= ' WHERE d.fk_propal = '.$this->id;
+		$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 .= ' d.fk_unit,';
+		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+		$sql .= ' d.date_start, d.date_end';
+		$sql .= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
+		$sql .= ' WHERE d.fk_propal = '.$this->id;
 		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
-		$sql.= ' ORDER by d.rang';
+		$sql .= ' ORDER by d.rang';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1432,13 +1432,13 @@ 
 
 				$line                   = new PropaleLigne($this->db);
 
-				$line->rowid			= $objp->rowid; //Deprecated
-				$line->id				= $objp->rowid;
-				$line->fk_propal		= $objp->fk_propal;
-				$line->fk_parent_line	= $objp->fk_parent_line;
+				$line->rowid = $objp->rowid; //Deprecated
+				$line->id = $objp->rowid;
+				$line->fk_propal = $objp->fk_propal;
+				$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->vat_src_code     = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
@@ -1449,7 +1449,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;
@@ -1457,9 +1457,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;
@@ -1467,20 +1467,20 @@ 
 
 				$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->fk_unit          = $objp->fk_unit;
 
-				$line->date_start  		= $this->db->jdate($objp->date_start);
-				$line->date_end  		= $this->db->jdate($objp->date_end);
+				$line->date_start = $this->db->jdate($objp->date_start);
+				$line->date_end = $this->db->jdate($objp->date_end);
 
 				// 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;
@@ -1488,7 +1488,7 @@ 
 
 				$line->fetch_optionals();
 
-				$this->lines[$i]        = $line;
+				$this->lines[$i] = $line;
 				//dol_syslog("1 ".$line->fk_product);
 				//print "xx $i ".$this->lines[$i]->fk_product;
 				$i++;
@@ -1500,7 +1500,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -3;
 		}
 	}
@@ -1515,19 +1515,19 @@ 
     {
         global $conf, $hookmanager;
 
-    	$action='update';
+    	$action = 'update';
         $error = 0;
 
     	// Actions on extra fields (by external module or standard code)
     	// TODO le hook fait double emploi avec le trigger !!
     	$hookmanager->initHooks(array('propaldao'));
-    	$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++;
@@ -1554,13 +1554,13 @@ 
      *  @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
      *  @return int         		<0 if KO, 0=Nothing done, >=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;
 
-        $error=0;
+        $error = 0;
 
         // Protection
         if ($this->statut == self::STATUS_VALIDATED)
@@ -1569,15 +1569,15 @@ 
             return 0;
         }
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->propal_advance->validate))))
+        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate))))
         {
-            $this->error='ErrorPermissionDenied';
+            $this->error = 'ErrorPermissionDenied';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
         }
 
-        $now=dol_now();
+        $now = dol_now();
 
         $this->db->begin();
 
@@ -1586,7 +1586,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);
         }
@@ -1597,28 +1597,28 @@ 
         $this->newref = $num;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-        $sql.= " SET ref = '".$num."',";
-        $sql.= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-        $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+        $sql .= " SET ref = '".$num."',";
+        $sql .= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+        $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
         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('PROPAL_VALIDATE',$user);
+            $result = $this->call_trigger('PROPAL_VALIDATE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$this->oldref = $this->ref;
 
@@ -1639,24 +1639,24 @@ 
         			{
         				dol_syslog("Rename ok");
         				// Rename docs starting with $oldref with $newref
-        				$listoffiles=dol_dir_list($conf->propal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-        				foreach($listoffiles as $fileentry)
+        				$listoffiles = dol_dir_list($conf->propal->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 = self::STATUS_VALIDATED;
-        	$this->user_valid_id=$user->id;
-        	$this->datev=$now;
+        	$this->user_valid_id = $user->id;
+        	$this->datev = $now;
 
         	$this->db->commit();
         	return 1;
@@ -1677,61 +1677,61 @@ 
      *  @param  int			$notrigger	1=Does not execute triggers, 0= execute triggers
      *  @return	int         			<0 if KO, >0 if OK
      */
-    function set_date($user, $date, $notrigger=0)
+    function set_date($user, $date, $notrigger = 0)
     {
         if (empty($date))
         {
-            $this->error='ErrorBadParameter';
+            $this->error = 'ErrorBadParameter';
             dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
             return -1;
         }
 
-        if (! empty($user->rights->propal->creer))
+        if (!empty($user->rights->propal->creer))
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->date = $date;
-            	$this->datep = $date;    // deprecated
+            	$this->datep = $date; // deprecated
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -1744,54 +1744,54 @@ 
      *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
      *	@return     int         				<0 if KO, >0 if OK
      */
-    function set_echeance($user, $date_fin_validite, $notrigger=0)
+    function set_echeance($user, $date_fin_validite, $notrigger = 0)
     {
-        if (! empty($user->rights->propal->creer))
+        if (!empty($user->rights->propal->creer))
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite!=''?"'".$this->db->idate($date_fin_validite)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite != '' ? "'".$this->db->idate($date_fin_validite)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->fin_validite = $date_fin_validite;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -1804,54 +1804,54 @@ 
      *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
      *	@return     int         				<0 if ko, >0 if ok
      */
-    function set_date_livraison($user, $date_livraison, $notrigger=0)
+    function set_date_livraison($user, $date_livraison, $notrigger = 0)
     {
-        if (! empty($user->rights->propal->creer))
+        if (!empty($user->rights->propal->creer))
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $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;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->date_livraison = $date_livraison;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -1864,63 +1864,63 @@ 
      *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *  @return     int           			<0 if KO, >0 if OK
      */
-    function set_availability($user, $id, $notrigger=0)
+    function set_availability($user, $id, $notrigger = 0)
     {
-        if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
+        if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET fk_availability = '".$id."'";
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET fk_availability = '".$id."'";
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->fk_availability = $id;
             	$this->availability_id = $id;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
         {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
+        	$error_str = 'Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
+        	$this->error = $error_str;
+        	$this->errors[] = $this->error;
         	return -2;
         }
     }
@@ -1933,65 +1933,65 @@ 
      *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *  @return     int           		<0 if KO, >0 if OK
      */
-    function set_demand_reason($user, $id, $notrigger=0)
+    function set_demand_reason($user, $id, $notrigger = 0)
     {
-        if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
+        if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET fk_input_reason = ".$id;
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET fk_input_reason = ".$id;
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->fk_input_reason = $id;
             	$this->demand_reason_id = $id;
             }
 
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
         {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
+        	$error_str = 'Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
+        	$this->error = $error_str;
+        	$this->errors[] = $this->error;
         	return -2;
         }
     }
@@ -2004,53 +2004,53 @@ 
      *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *  @return     int						<0 if ko, >0 if ok
      */
-    function set_ref_client($user, $ref_client, $notrigger=0)
+    function set_ref_client($user, $ref_client, $notrigger = 0)
     {
-        if (! empty($user->rights->propal->creer))
+        if (!empty($user->rights->propal->creer))
         {
-            $error=0;
+            $error = 0;
 
             $this->db->begin();
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
-            $sql.= ' WHERE rowid = '.$this->id;
+            $sql .= ' WHERE rowid = '.$this->id;
 
             dol_syslog(__METHOD__.' $this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->ref_client = $ref_client;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
@@ -2067,58 +2067,58 @@ 
      *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return     int         		<0 if ko, >0 if ok
      */
-    function set_remise_percent($user, $remise, $notrigger=0)
+    function set_remise_percent($user, $remise, $notrigger = 0)
     {
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
-        if (! empty($user->rights->propal->creer))
+        if (!empty($user->rights->propal->creer))
         {
             $remise = price2num($remise);
 
-            $error=0;
+            $error = 0;
 
             $this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->remise_percent = $remise;
             	$this->update_price(1);
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -2132,59 +2132,59 @@ 
      *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return     int         		<0 if ko, >0 if ok
      */
-    function set_remise_absolue($user, $remise, $notrigger=0)
+    function set_remise_absolue($user, $remise, $notrigger = 0)
     {
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
-        if (! empty($user->rights->propal->creer))
+        if (!empty($user->rights->propal->creer))
         {
             $remise = price2num($remise);
 
-            $error=0;
+            $error = 0;
 
             $this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-            $sql.= " SET remise_absolue = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+            $sql .= " SET remise_absolue = ".$remise;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->remise_absolue = $remise;
             	$this->update_price(1);
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -2200,31 +2200,31 @@ 
      *  @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)
     {
 
         $this->statut = $statut;
-        $error=0;
+        $error = 0;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-        $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('PROPAL_REOPEN',$user);
+                $result = $this->call_trigger('PROPAL_REOPEN', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
@@ -2235,14 +2235,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
 		{
@@ -2261,78 +2261,78 @@ 
      *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return     int         		<0 if KO, >0 if OK
      */
-    function cloture($user, $statut, $note, $notrigger=0)
+    function cloture($user, $statut, $note, $notrigger = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-        $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->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
-        	$trigger_name='PROPAL_CLOSE_REFUSED';
+        	$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
+        	$trigger_name = 'PROPAL_CLOSE_REFUSED';
 
             if ($statut == self::STATUS_SIGNED)
             {
-            	$trigger_name='PROPAL_CLOSE_SIGNED';
-				$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+            	$trigger_name = 'PROPAL_CLOSE_SIGNED';
+				$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
 
                 // The connected company is classified as a client
-                $soc=new Societe($this->db);
+                $soc = new Societe($this->db);
                 $soc->id = $this->socid;
-                $result=$soc->set_as_client();
+                $result = $soc->set_as_client();
 
                 if ($result < 0)
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -2;
                 }
             }
             if ($statut == self::STATUS_BILLED)
             {
-            	$trigger_name='PROPAL_CLASSIFY_BILLED';
+            	$trigger_name = 'PROPAL_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
 	               $this->generateDocument($modelpdf, $outputlangs);
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->statut = $statut;
             	$this->date_cloture = $now;
             	$this->note_private = $note;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
 	            // 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;
@@ -2345,7 +2345,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -2358,9 +2358,9 @@ 
      *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return     int     			<0 si ko, >0 si ok
      */
-    function classifyBilled(User $user, $notrigger=0)
+    function classifyBilled(User $user, $notrigger = 0)
     {
-    	$error=0;
+    	$error = 0;
 
     	$this->db->begin();
 
@@ -2368,41 +2368,41 @@ 
         $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if (!$resql)
         {
-        	$this->errors[]=$this->db->error();
+        	$this->errors[] = $this->db->error();
         	$error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
-        	$this->oldcopy= clone $this;
-        	$this->statut=self::STATUS_BILLED;
+        	$this->oldcopy = clone $this;
+        	$this->statut = self::STATUS_BILLED;
         }
 
-        if (! $notrigger && empty($error))
+        if (!$notrigger && empty($error))
         {
         	// Call trigger
-        	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+        	$result = $this->call_trigger('PROPAL_MODIFY', $user);
         	if ($result < 0) $error++;
         	// End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$this->db->commit();
         	return 1;
         }
         else
         {
-        	foreach($this->errors as $errmsg)
+        	foreach ($this->errors as $errmsg)
         	{
         		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        		$this->error.=($this->error?', '.$errmsg:$errmsg);
+        		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
         	}
         	$this->db->rollback();
-        	return -1*$error;
+        	return -1 * $error;
         }
     }
 
@@ -2416,7 +2416,7 @@ 
     function classer_facturee()
     {
         global $user;
-		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+		dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
 
     	return $this->classifyBilled($user);
     }
@@ -2428,52 +2428,52 @@ 
      *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return		int					<0 if KO, >0 if OK
      */
-    function set_draft($user, $notrigger=0)
+    function set_draft($user, $notrigger = 0)
     {
-    	$error=0;
+    	$error = 0;
 
     	$this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = ".self::STATUS_DRAFT;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if (!$resql)
         {
-        	$this->errors[]=$this->db->error();
+        	$this->errors[] = $this->db->error();
         	$error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
-        	$this->oldcopy= clone $this;
+        	$this->oldcopy = clone $this;
         	$this->statut = self::STATUS_DRAFT;
             $this->brouillon = 1;
         }
 
-        if (! $notrigger && empty($error))
+        if (!$notrigger && empty($error))
         {
         	// Call trigger
-        	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+        	$result = $this->call_trigger('PROPAL_MODIFY', $user);
         	if ($result < 0) $error++;
         	// End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$this->db->commit();
         	return 1;
         }
         else
         {
-        	foreach($this->errors as $errmsg)
+        	foreach ($this->errors as $errmsg)
         	{
         		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        		$this->error.=($this->error?', '.$errmsg:$errmsg);
+        		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
         	}
         	$this->db->rollback();
-        	return -1*$error;
+        	return -1 * $error;
         }
     }
 
@@ -2491,32 +2491,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.datep', $sortorder='DESC')
+    function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
     {
         global $user;
 
         $ga = array();
 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " p.rowid as propalid, 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."propal 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 IN (".getEntity('propal').")";
-        $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 = ".self::STATUS_DRAFT;
-        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);
+        $sql .= " p.rowid as propalid, 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."propal 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 IN (".getEntity('propal').")";
+        $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 = ".self::STATUS_DRAFT;
+        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);
@@ -2537,7 +2537,7 @@ 
                     }
                     else
 					{
-                        $ga[$i]['id']	= $obj->propalid;
+                        $ga[$i]['id'] = $obj->propalid;
                         $ga[$i]['ref'] 	= $obj->ref;
                         $ga[$i]['name'] = $obj->name;
                     }
@@ -2575,12 +2575,12 @@ 
         $ga = array();
         $linkedInvoices = array();
 
-        $this->fetchObjectLinked($id,$this->element);
-        foreach($this->linkedObjectsIds as $objecttype => $objectid)
+        $this->fetchObjectLinked($id, $this->element);
+        foreach ($this->linkedObjectsIds as $objecttype => $objectid)
         {
         	// Nouveau système du comon object renvoi des rowid et non un id linéaire de 1 à n
         	// On parcourt donc une liste d'objets en tant qu'objet unique
-			foreach($objectid as $key => $object)
+			foreach ($objectid as $key => $object)
             {
                 // Cas des factures liees directement
                 if ($objecttype == 'facture')
@@ -2590,10 +2590,10 @@ 
                 // Cas des factures liees par un autre objet (ex: commande)
                 else
 				{
-                    $this->fetchObjectLinked($object,$objecttype);
-                    foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid)
+                    $this->fetchObjectLinked($object, $objecttype);
+                    foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid)
                     {
-						foreach($subobjectid as $subkey => $subobject)
+						foreach ($subobjectid as $subkey => $subobject)
                         {
                         	if ($subobjecttype == 'facture')
                         	{
@@ -2607,18 +2607,18 @@ 
 
         if (count($linkedInvoices) > 0)
         {
-            $sql= "SELECT rowid as facid, facnumber, total, datef as df, fk_user_author, fk_statut, paye";
-            $sql.= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql.= " WHERE rowid IN (".implode(',',$linkedInvoices).")";
+            $sql = "SELECT rowid as facid, facnumber, total, datef as df, fk_user_author, fk_statut, paye";
+            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
+            $sql .= " WHERE rowid IN (".implode(',', $linkedInvoices).")";
 
             dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
 
             if ($resql)
             {
-                $tab_sqlobj=array();
+                $tab_sqlobj = array();
                 $nump = $this->db->num_rows($resql);
-                for ($i = 0;$i < $nump;$i++)
+                for ($i = 0; $i < $nump; $i++)
                 {
                     $sqlobj = $this->db->fetch_object($resql);
                     $tab_sqlobj[] = $sqlobj;
@@ -2656,24 +2656,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;
         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('PROPAL_DELETE',$user);
+            $result = $this->call_trigger('PROPAL_DELETE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = ".$this->id;
             if ($this->db->query($sql))
@@ -2689,33 +2689,33 @@ 
                     $res = $this->delete_linked_contact();
                     if ($res < 0) $error++;
 
-                    if (! $error)
+                    if (!$error)
                     {
                         // We remove directory
                         $ref = dol_sanitizeFileName($this->ref);
                         if ($conf->propal->dir_output && !empty($this->ref))
                         {
-                            $dir = $conf->propal->dir_output . "/" . $ref ;
-                            $file = $dir . "/" . $ref . ".pdf";
+                            $dir = $conf->propal->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;
                                 }
@@ -2724,21 +2724,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();
@@ -2746,21 +2746,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;
             }
@@ -2780,13 +2780,13 @@ 
      *  @return int                  	>0 if OK, <0 if KO
      *  @deprecated  use set_availability
      */
-    function availability($availability_id, $notrigger=0)
+    function availability($availability_id, $notrigger = 0)
     {
         global $user;
 
         if ($this->statut >= self::STATUS_DRAFT)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
@@ -2795,49 +2795,49 @@ 
             $sql .= ' WHERE rowid='.$this->id;
 
             dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->availability_id = $availability_id;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
         {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
+        	$error_str = 'Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
+        	$this->error = $error_str;
+        	$this->errors[] = $this->error;
             return -2;
         }
     }
@@ -2850,11 +2850,11 @@ 
      *	@return int						>0 si ok, <0 si ko
      *	@deprecated use set_demand_reason
      */
-    function demand_reason($demand_reason_id, $notrigger=0)
+    function demand_reason($demand_reason_id, $notrigger = 0)
     {
         if ($this->statut >= self::STATUS_DRAFT)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
@@ -2863,49 +2863,49 @@ 
             $sql .= ' WHERE rowid='.$this->id;
 
             dol_syslog(__METHOD__.' demand_reason('.$demand_reason_id.')', LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->demand_reason_id = $demand_reason_id;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('PROPAL_MODIFY',$user);
+            	$result = $this->call_trigger('PROPAL_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
         {
-        	$error_str='Propal status do not meet requirement '.$this->statut;
+        	$error_str = 'Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
+        	$this->error = $error_str;
+        	$this->errors[] = $this->error;
             return -2;
         }
     }
@@ -2920,10 +2920,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."propal 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."propal as c";
+        $sql .= " WHERE c.rowid = ".$id;
 
         $result = $this->db->query($sql);
 
@@ -2941,20 +2941,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;
                 }
 
 
@@ -2975,7 +2975,7 @@ 
      *    	@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);
     }
@@ -2987,24 +2987,24 @@ 
      *    	@param      int			$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
      *    	@return     string		Label
      */
-     function LibStatut($statut,$mode=1)
+     function LibStatut($statut, $mode = 1)
     {
 		global $langs;
 		$langs->load("propal");
 
-		if ($statut==self::STATUS_DRAFT) $statuttrans='statut0';
-		if ($statut==self::STATUS_VALIDATED) $statuttrans='statut1';
-		if ($statut==self::STATUS_SIGNED) $statuttrans='statut3';
-		if ($statut==self::STATUS_NOTSIGNED) $statuttrans='statut5';
-		if ($statut==self::STATUS_BILLED) $statuttrans='statut6';
+		if ($statut == self::STATUS_DRAFT) $statuttrans = 'statut0';
+		if ($statut == self::STATUS_VALIDATED) $statuttrans = 'statut1';
+		if ($statut == self::STATUS_SIGNED) $statuttrans = 'statut3';
+		if ($statut == self::STATUS_NOTSIGNED) $statuttrans = 'statut5';
+		if ($statut == self::STATUS_BILLED) $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_short[$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);
      }
 
 
@@ -3015,51 +3015,51 @@ 
      *      @param          int		$mode   "opened" for proposal to close, "signed" for proposal to invoice
      *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
      */
-    function load_board($user,$mode)
+    function load_board($user, $mode)
     {
         global $conf, $langs;
 
         $clause = " WHERE";
 
         $sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal 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 IN (".getEntity('propal').")";
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+        $sql .= $clause." p.entity IN (".getEntity('propal').")";
+        if ($mode == 'opened') $sql .= " AND p.fk_statut = ".self::STATUS_VALIDATED;
+        if ($mode == 'signed') $sql .= " AND p.fk_statut = ".self::STATUS_SIGNED;
+        if ($user->societe_id) $sql .= " AND p.fk_soc = ".$user->societe_id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 	        $langs->load("propal");
-	        $now=dol_now();
+	        $now = dol_now();
 
             if ($mode == 'opened') {
-	            $delay_warning=$conf->propal->cloture->warning_delay;
+	            $delay_warning = $conf->propal->cloture->warning_delay;
 	            $statut = self::STATUS_VALIDATED;
 	            $label = $langs->trans("PropalsToClose");
             }
             if ($mode == 'signed') {
-	            $delay_warning=$conf->propal->facturation->warning_delay;
+	            $delay_warning = $conf->propal->facturation->warning_delay;
 	            $statut = self::STATUS_SIGNED;
-	            $label = $langs->trans("PropalsToBill");         // We set here bill but may be billed or ordered
+	            $label = $langs->trans("PropalsToBill"); // We set here bill but 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.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
 	        $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
-	        $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')
@@ -3078,7 +3078,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -3099,8 +3099,8 @@ 
         $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)
         {
@@ -3115,13 +3115,13 @@ 
         }
 
         // Initialise parametres
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
-        $this->ref_client='NEMICEPS';
-        $this->specimen=1;
+        $this->ref_client = 'NEMICEPS';
+        $this->specimen = 1;
         $this->socid = 1;
         $this->date = time();
-        $this->fin_validite = $this->date+3600*24*30;
+        $this->fin_validite = $this->date + 3600 * 24 * 30;
         $this->cond_reglement_id   = 1;
         $this->cond_reglement_code = 'RECEP';
         $this->mode_reglement_id   = 7;
@@ -3130,44 +3130,44 @@ 
         $this->availability_code   = 'AV_NOW';
         $this->demand_reason_id    = 1;
         $this->demand_reason_code  = 'SRC_00';
-        $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 PropaleLigne($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=20;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
+            $line = new PropaleLigne($this->db);
+            $line->desc = $langs->trans("Description")." ".$xnbp;
+            $line->qty = 1;
+            $line->subprice = 100;
+            $line->price = 100;
+            $line->tva_tx = 20;
+            $line->localtax1_tx = 0;
+            $line->localtax2_tx = 0;
             if ($xnbp == 2)
             {
-                $line->total_ht=50;
-                $line->total_ttc=60;
-                $line->total_tva=10;
-                $line->remise_percent=50;
+                $line->total_ht = 50;
+                $line->total_ttc = 60;
+                $line->total_tva = 10;
+                $line->remise_percent = 50;
             }
             else
             {
-                $line->total_ht=100;
-                $line->total_ttc=120;
-                $line->total_tva=20;
-                $line->remise_percent=00;
+                $line->total_ht = 100;
+                $line->total_ttc = 120;
+                $line->total_tva = 20;
+                $line->remise_percent = 00;
             }
 
             if ($num_prods > 0)
             {
             	$prodid = mt_rand(1, $num_prods);
-            	$line->fk_product=$prodids[$prodid];
-		$line->product_ref='SPECIMEN';
+            	$line->fk_product = $prodids[$prodid];
+		$line->product_ref = 'SPECIMEN';
             }
 
-            $this->lines[$xnbp]=$line;
+            $this->lines[$xnbp] = $line;
 
             $this->total_ht       += $line->total_ht;
             $this->total_tva      += $line->total_tva;
@@ -3186,27 +3186,27 @@ 
     {
         global $user;
 
-        $this->nb=array();
+        $this->nb = array();
         $clause = "WHERE";
 
         $sql = "SELECT count(p.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal 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 IN (".getEntity('propal').")";
+        $sql .= " ".$clause." p.entity IN (".getEntity('propal').")";
 
-        $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["proposals"]=$obj->nb;
+                $this->nb["proposals"] = $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -3214,7 +3214,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -3229,12 +3229,12 @@ 
      */
     function getNextNumRef($soc)
     {
-        global $conf,$langs;
+        global $conf, $langs;
         $langs->load("propal");
 
-        if (! empty($conf->global->PROPALE_ADDON))
+        if (!empty($conf->global->PROPALE_ADDON))
         {
-        	$mybool=false;
+        	$mybool = false;
 
             $file = $conf->global->PROPALE_ADDON.".php";
             $classname = $conf->global->PROPALE_ADDON;
@@ -3246,18 +3246,18 @@ 
                 $dir = dol_buildpath($reldir."core/modules/propale/");
 
                 // 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 != "")
             {
@@ -3265,7 +3265,7 @@ 
             }
             else
 			{
-                $this->error=$obj->error;
+                $this->error = $obj->error;
                 //dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
                 return "";
             }
@@ -3288,72 +3288,72 @@ 
      *  @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
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result='';
-        $label='';
-        $url='';
+        $result = '';
+        $label = '';
+        $url = '';
 
         if ($user->rights->propal->lire)
         {
-            $label = '<u>' . $langs->trans("ShowPropal") . '</u>';
-            if (! empty($this->ref))
-                $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            if (! empty($this->ref_client))
-                $label.= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-            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);
+            $label = '<u>'.$langs->trans("ShowPropal").'</u>';
+            if (!empty($this->ref))
+                $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+            if (!empty($this->ref_client))
+                $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+            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.'/comm/propal/card.php?id='.$this->id. $get_params;
+                $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
             }
             if ($option == 'compta') {  // deprecated
-                $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
+                $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
             }
             if ($option == 'expedition') {
-                $url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id. $get_params;
+                $url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id.$get_params;
             }
             if ($option == 'document') {
-                $url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id. $get_params;
+                $url = DOL_URL_ROOT.'/comm/propal/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("ShowPropal");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowPropal");
+                $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>';
 
         if ($withpicto)
-            $result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+            $result .= ($linkstart.img_object(($notooltip ? '' : $label), $this->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;
     }
 
@@ -3369,17 +3369,17 @@ 
         $this->lines = array();
 
         $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-        $sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.localtax1_tx, pt.localtax2_tx, pt.localtax1_type, pt.localtax2_type, pt.remise_percent, pt.subprice, pt.info_bits,';
-        $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.total_localtax1, pt.total_localtax2, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code,';
-        $sql.= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,';
-	    $sql.= ' pt.fk_unit,';
-        $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.description as product_desc, p.tobatch as product_tobatch,';
-        $sql.= ' p.entity,';
-		$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-        $sql.= ' WHERE pt.fk_propal = '.$this->id;
-        $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
+        $sql .= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.localtax1_tx, pt.localtax2_tx, pt.localtax1_type, pt.localtax2_type, pt.remise_percent, pt.subprice, pt.info_bits,';
+        $sql .= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.total_localtax1, pt.total_localtax2, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code,';
+        $sql .= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,';
+	    $sql .= ' pt.fk_unit,';
+        $sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.description as product_desc, p.tobatch as product_tobatch,';
+        $sql .= ' p.entity,';
+		$sql .= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+        $sql .= ' WHERE pt.fk_propal = '.$this->id;
+        $sql .= ' ORDER BY pt.rang ASC, pt.rowid';
 
         dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -3392,53 +3392,53 @@ 
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->lines[$i]					= new PropaleLigne($this->db);
-                $this->lines[$i]->id				= $obj->rowid; // for backward compatibility
+                $this->lines[$i] = new PropaleLigne($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]->desc       		= $obj->description;
-                $this->lines[$i]->description 		= $obj->description;
-                $this->lines[$i]->fk_product		= $obj->fk_product;
-                $this->lines[$i]->ref				= $obj->ref;
-                $this->lines[$i]->product_ref		= $obj->ref;
-                $this->lines[$i]->entity            = $obj->entity;             // Product entity
-                $this->lines[$i]->product_label		= $obj->product_label;
+                $this->lines[$i]->desc = $obj->description;
+                $this->lines[$i]->description = $obj->description;
+                $this->lines[$i]->fk_product = $obj->fk_product;
+                $this->lines[$i]->ref = $obj->ref;
+                $this->lines[$i]->product_ref = $obj->ref;
+                $this->lines[$i]->entity            = $obj->entity; // Product entity
+                $this->lines[$i]->product_label = $obj->product_label;
                 $this->lines[$i]->product_desc		= $obj->product_desc;
                 $this->lines[$i]->product_tobatch   = $obj->product_tobatch;
-                $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]->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]->remise_percent = $obj->remise_percent;
 
                 $this->lines[$i]->vat_src_code      = $obj->vat_src_code;
-                $this->lines[$i]->tva_tx			= $obj->tva_tx;
+                $this->lines[$i]->tva_tx = $obj->tva_tx;
                 $this->lines[$i]->localtax1_tx		= $obj->localtax1_tx;
                 $this->lines[$i]->localtax2_tx		= $obj->localtax2_tx;
                 $this->lines[$i]->localtax1_type	= $obj->localtax1_type;
                 $this->lines[$i]->localtax2_type	= $obj->localtax2_type;
                 $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]->total_localtax1	= $obj->total_localtax1;
                 $this->lines[$i]->total_localtax2	= $obj->total_localtax2;
-                $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]->date_start		= $this->db->jdate($obj->date_start);
-                $this->lines[$i]->date_end			= $this->db->jdate($obj->date_end);
-	            $this->lines[$i]->fk_unit			= $obj->fk_unit;
+                $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]->date_start = $this->db->jdate($obj->date_start);
+                $this->lines[$i]->date_end = $this->db->jdate($obj->date_end);
+	            $this->lines[$i]->fk_unit = $obj->fk_unit;
 
 				// 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;
@@ -3452,7 +3452,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -3467,19 +3467,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("propale");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'azur';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->PROPALE_ADDON_PDF)) {
+			} elseif (!empty($conf->global->PROPALE_ADDON_PDF)) {
 				$modele = $conf->global->PROPALE_ADDON_PDF;
 			}
 		}
@@ -3513,16 +3513,16 @@ 
  */
 class PropaleLigne extends CommonObjectLine
 {
-    public $element='propaldet';
-    public $table_element='propaldet';
+    public $element = 'propaldet';
+    public $table_element = 'propaldet';
 
     var $oldline;
 
     // From llx_propaldet
     var $fk_propal;
     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
@@ -3548,18 +3548,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
@@ -3599,12 +3599,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 $date_start;
     var $date_end;
@@ -3626,7 +3626,7 @@ 
      */
     function __construct($db)
     {
-        $this->db= $db;
+        $this->db = $db;
     }
 
     /**
@@ -3638,44 +3638,44 @@ 
 	function fetch($rowid)
 	{
 		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, 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.fk_unit,';
-		$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
-		$sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,';
-		$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
-		$sql.= ' pd.date_start, pd.date_end, pd.product_type';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet 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.fk_unit,';
+		$sql .= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
+		$sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
+		$sql .= ' pd.date_start, pd.date_end, pd.product_type';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet 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->id               = $objp->rowid;
-			$this->rowid			= $objp->rowid;     // deprecated
-			$this->fk_propal		= $objp->fk_propal;
-			$this->fk_parent_line	= $objp->fk_parent_line;
+			$this->id = $objp->rowid;
+			$this->rowid			= $objp->rowid; // deprecated
+			$this->fk_propal = $objp->fk_propal;
+			$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->vat_src_code		= $objp->vat_src_code;
+			$this->qty = $objp->qty;
+			$this->price			= $objp->price; // deprecated
+			$this->subprice = $objp->subprice;
+			$this->vat_src_code = $objp->vat_src_code;
 			$this->tva_tx			= $objp->tva_tx;
-			$this->remise			= $objp->remise;    // deprecated
-			$this->remise_percent	= $objp->remise_percent;
+			$this->remise			= $objp->remise; // deprecated
+			$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];
@@ -3684,21 +3684,21 @@ 
 
 			$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->fk_unit          = $objp->fk_unit;
 
 			$this->date_start       = $this->db->jdate($objp->date_start);
-            $this->date_end         = $this->db->jdate($objp->date_end);
+            $this->date_end = $this->db->jdate($objp->date_end);
 
 			// 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;
@@ -3720,37 +3720,37 @@ 
      *	@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,$user;
+        global $conf, $user;
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->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) || ! is_numeric($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 (! is_numeric($this->qty)) $this->qty = 0;
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=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) || !is_numeric($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 (!is_numeric($this->qty)) $this->qty = 0;
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
+        if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice = 0;
+        if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht = 0;
+        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
        // if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -3772,71 +3772,71 @@ 
 
         // Insert line into database
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet';
-        $sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
-		$sql.= ' fk_remise_except, qty, vat_src_code, 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.= ' fk_unit,';
-        $sql.= ' date_start, date_end';
-		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
-        $sql.= " VALUES (".$this->fk_propal.",";
-        $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.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $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.= " ".($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->fk_unit ? 'NULL' : $this->fk_unit).',';
-        $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
-        $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-		$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.= ')';
+        $sql .= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
+		$sql .= ' fk_remise_except, qty, vat_src_code, 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 .= ' fk_unit,';
+        $sql .= ' date_start, date_end';
+		$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
+        $sql .= " VALUES (".$this->fk_propal.",";
+        $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 .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+        $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 .= " ".($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->fk_unit ? 'NULL' : $this->fk_unit).',';
+        $sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").',';
+        $sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$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 .= ')';
 
         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.'propaldet');
+            $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
 
             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('LINEPROPAL_INSERT',$user);
+                $result = $this->call_trigger('LINEPROPAL_INSERT', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -3850,7 +3850,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -3862,23 +3862,23 @@ 
      *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return	 int  <0 if ko, >0 if ok
      */
-    function delete($notrigger=0)
+    function delete($notrigger = 0)
     {
-        global $conf,$user;
+        global $conf, $user;
 
-        $error=0;
+        $error = 0;
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
         dol_syslog("PropaleLigne::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++;
@@ -3886,10 +3886,10 @@ 
         		}
         	}
 
-        	if (! $error && ! $notrigger)
+        	if (!$error && !$notrigger)
         	{
 	            // Call trigger
-	            $result=$this->call_trigger('LINEPROPAL_DELETE',$user);
+	            $result = $this->call_trigger('LINEPROPAL_DELETE', $user);
 	            if ($result < 0)
 	            {
 	                $this->db->rollback();
@@ -3904,7 +3904,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -3916,33 +3916,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,$user;
+        global $conf, $user;
 
-        $error=0;
+        $error = 0;
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->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->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 && $pa_ht_isemptystring)
@@ -3961,64 +3961,64 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet 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.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
-        $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 .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
+        $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.= ", 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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-        $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-	    $sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+            $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 .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+	    $sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
 		// 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('LINEPROPAL_UPDATE',$user);
+                $result = $this->call_trigger('LINEPROPAL_UPDATE', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -4032,7 +4032,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -4050,14 +4050,14 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet 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("PropaleLigne::update_total", LOG_DEBUG);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -4065,7 +4065,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }

Braces +457 added lines, -270 removed lines

@@ -240,7 +240,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)
@@ -252,7 +254,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;
+            }
             $vat_src_code = '';     // May be defined into tva_tx
 
             $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
@@ -262,8 +266,7 @@ 
             if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else
+            } else
             {
                 $price = $prod->price;
             }
@@ -278,7 +281,9 @@ 
             $line->vat_src_code=$vat_src_code;
             $line->tva_tx=$tva_tx;
 	        $line->fk_unit=$prod->fk_unit;
-			if ($tva_npr) $line->info_bits = 1;
+			if ($tva_npr) {
+				$line->info_bits = 1;
+			}
 
             $this->lines[]=$line;
         }
@@ -304,9 +309,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;
             }
@@ -343,21 +350,18 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -2;
@@ -408,11 +412,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);
@@ -425,14 +439,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 == self::STATUS_DRAFT)
         {
@@ -553,7 +568,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;
@@ -567,7 +584,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,$mysoc);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -575,15 +594,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();
@@ -637,9 +654,17 @@ 
         $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($type)) $type=0;
+        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($type)) {
+        	$type=0;
+        }
 
         if ($this->statut == self::STATUS_DRAFT)
         {
@@ -751,7 +776,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);
 
@@ -760,16 +787,14 @@ 
 
                 $this->db->commit();
                 return $result;
-            }
-            else
+            } else
             {
                 $this->error=$this->line->error;
 
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action");
             return -2;
@@ -797,13 +822,11 @@ 
                 $this->update_price(1);
 
                 return 1;
-            }
-            else
+            } else
             {
                 return -1;
             }
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -826,13 +849,21 @@ 
         $now=dol_now();
 
         // Clean parameters
-        if (empty($this->date)) $this->date=$this->datep;
+        if (empty($this->date)) {
+        	$this->date=$this->datep;
+        }
         $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
-        if (empty($this->availability_id)) $this->availability_id=0;
-        if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
+        if (empty($this->availability_id)) {
+        	$this->availability_id=0;
+        }
+        if (empty($this->demand_reason_id)) {
+        	$this->demand_reason_id=0;
+        }
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		if (!empty($this->multicurrency_code)) {
+			list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -852,9 +883,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';
@@ -953,7 +987,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
@@ -1015,7 +1051,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);
+                    }
                 }
 
                 // Set delivery address
@@ -1044,16 +1082,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)
                         {
@@ -1062,15 +1103,13 @@ 
                             if ($result < 0) { $error++; }
                             // End call triggers
                         }
-                    }
-                    else
+                    } else
 					{
                         $this->error=$this->db->lasterror();
                         $error++;
                     }
                 }
-            }
-            else
+            } else
 			{
                 $this->error=$this->db->lasterror();
                 $error++;
@@ -1081,14 +1120,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();
@@ -1132,8 +1169,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 dest object
         $clonedObj = clone $this;
@@ -1167,8 +1205,7 @@ 
             $clonedObj->ref_client  = '';
 
             // TODO Change product price if multi-prices
-        }
-        else
+        } else
         {
             $objsoc->fetch($clonedObj->socid);
         }
@@ -1183,23 +1220,28 @@ 
         $clonedObj->date		= $now;
         $clonedObj->datep		= $now;    // deprecated
         $clonedObj->fin_validite	= $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
-        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $clonedObj->ref_client	= '';
+        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+        	$clonedObj->ref_client	= '';
+        }
 
         // Create clone
 
         $result=$clonedObj->create($user);
-        if ($result < 0) $error++;
-        else
+        if ($result < 0) {
+        	$error++;
+        } else
         {
 			// copy internal contacts
-    		if ($clonedObj->copy_linked_contact($this, 'internal') < 0)
-            	$error++;
+    		if ($clonedObj->copy_linked_contact($this, 'internal') < 0) {
+    		            	$error++;
+    		}
 
             // copy external contacts if same company
             elseif ($this->socid == $clonedObj->socid)
             {
-		        if ($clonedObj->copy_linked_contact($this, 'external') < 0)
-					$error++;
+		        if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
+		        					$error++;
+		        }
             }
         }
 
@@ -1211,7 +1253,9 @@ 
                 $parameters=array('objFrom'=>$this,'clonedObj'=>$clonedObj);
                 $action='';
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$clonedObj,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
+                if ($reshook < 0) {
+                	$error++;
+                }
             }
 
             // Call trigger
@@ -1227,8 +1271,7 @@ 
         {
             $this->db->commit();
             return $clonedObj->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1279,8 +1322,11 @@ 
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
         $sql.= " WHERE p.fk_statut = c.id";
         $sql.= " AND p.entity IN (".getEntity('propal').")";
-        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);
@@ -1387,8 +1433,7 @@ 
 
             $this->error="Record Not Found";
             return 0;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;
@@ -1414,7 +1459,9 @@ 
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
 		$sql.= ' WHERE d.fk_propal = '.$this->id;
-		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		if ($only_product) {
+			$sql .= ' AND p.fk_product_type = 0';
+		}
 		$sql.= ' ORDER by d.rang';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -1497,8 +1544,7 @@ 
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -3;
@@ -1525,22 +1571,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;
 	    }
@@ -1586,11 +1634,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;
         }
@@ -1660,8 +1709,7 @@ 
 
         	$this->db->commit();
         	return 1;
-        }
-        else
+        } else
 		{
         	$this->db->rollback();
         	return -1;
@@ -1714,7 +1762,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -1722,8 +1772,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -1774,7 +1823,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -1782,8 +1833,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -1834,7 +1884,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -1842,8 +1894,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -1895,7 +1946,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -1903,8 +1956,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -1914,8 +1966,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
         	$error_str='Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
@@ -1966,7 +2017,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -1974,8 +2027,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -1985,8 +2037,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
         	$error_str='Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
@@ -2033,7 +2084,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2041,8 +2094,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2052,8 +2104,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -2101,7 +2152,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2109,8 +2162,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2167,7 +2219,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2175,8 +2229,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2208,7 +2261,9 @@ 
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
         $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;
 
@@ -2243,8 +2298,7 @@ 
 		    }
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -2336,14 +2390,12 @@ 
             {
 		        $this->db->commit();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -2385,7 +2437,9 @@ 
         {
         	// Call trigger
         	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-        	if ($result < 0) $error++;
+        	if ($result < 0) {
+        		$error++;
+        	}
         	// End call triggers
         }
 
@@ -2393,8 +2447,7 @@ 
         {
         	$this->db->commit();
         	return 1;
-        }
-        else
+        } else
         {
         	foreach($this->errors as $errmsg)
         	{
@@ -2456,7 +2509,9 @@ 
         {
         	// Call trigger
         	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-        	if ($result < 0) $error++;
+        	if ($result < 0) {
+        		$error++;
+        	}
         	// End call triggers
         }
 
@@ -2464,8 +2519,7 @@ 
         {
         	$this->db->commit();
         	return 1;
-        }
-        else
+        } else
         {
         	foreach($this->errors as $errmsg)
         	{
@@ -2500,19 +2554,31 @@ 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
         $sql.= " p.rowid as propalid, 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."propal 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 IN (".getEntity('propal').")";
         $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 = ".self::STATUS_DRAFT;
-        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 = ".self::STATUS_DRAFT;
+        }
+        if ($notcurrentuser > 0) {
+        	$sql.= " AND p.fk_user_author <> ".$user->id;
+        }
         $sql.= $this->db->order($sortfield,$sortorder);
         $sql.= $this->db->plimit($limit,$offset);
 
@@ -2530,12 +2596,10 @@ 
                     if ($shortlist == 1)
                     {
                         $ga[$obj->propalid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
+                    } else if ($shortlist == 2)
                     {
                         $ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
+                    } else
 					{
                         $ga[$i]['id']	= $obj->propalid;
                         $ga[$i]['ref'] 	= $obj->ref;
@@ -2546,8 +2610,7 @@ 
                 }
             }
             return $ga;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return -1;
@@ -2640,13 +2703,13 @@ 
                     }
                 }
                 return $ga;
-            }
-            else
+            } else
             {
                 return -1;
             }
+        } else {
+        	return $ga;
         }
-        else return $ga;
     }
 
     /**
@@ -2683,11 +2746,15 @@ 
                 {
                     // Delete linked object
                     $res = $this->deleteObjectLinked();
-                    if ($res < 0) $error++;
+                    if ($res < 0) {
+                    	$error++;
+                    }
 
                     // Delete linked contacts
                     $res = $this->delete_linked_contact();
-                    if ($res < 0) $error++;
+                    if ($res < 0) {
+                    	$error++;
+                    }
 
                     if (! $error)
                     {
@@ -2701,9 +2768,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;
@@ -2726,9 +2795,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++;
@@ -2743,29 +2814,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;
@@ -2812,7 +2879,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2820,8 +2889,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2831,8 +2899,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
         	$error_str='Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
@@ -2880,7 +2947,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('PROPAL_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2888,8 +2957,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2899,8 +2967,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
         	$error_str='Propal status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
@@ -2961,8 +3028,7 @@ 
             }
             $this->db->free($result);
 
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2992,19 +3058,43 @@ 
 		global $langs;
 		$langs->load("propal");
 
-		if ($statut==self::STATUS_DRAFT) $statuttrans='statut0';
-		if ($statut==self::STATUS_VALIDATED) $statuttrans='statut1';
-		if ($statut==self::STATUS_SIGNED) $statuttrans='statut3';
-		if ($statut==self::STATUS_NOTSIGNED) $statuttrans='statut5';
-		if ($statut==self::STATUS_BILLED) $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_short[$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==self::STATUS_DRAFT) {
+			$statuttrans='statut0';
+		}
+		if ($statut==self::STATUS_VALIDATED) {
+			$statuttrans='statut1';
+		}
+		if ($statut==self::STATUS_SIGNED) {
+			$statuttrans='statut3';
+		}
+		if ($statut==self::STATUS_NOTSIGNED) {
+			$statuttrans='statut5';
+		}
+		if ($statut==self::STATUS_BILLED) {
+			$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_short[$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);
+		}
      }
 
 
@@ -3030,9 +3120,15 @@ 
             $clause = " AND";
         }
         $sql.= $clause." p.entity IN (".getEntity('propal').")";
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
-        if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
+        if ($mode == 'opened') {
+        	$sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
+        }
+        if ($mode == 'signed') {
+        	$sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
+        }
+        if ($user->societe_id) {
+        	$sql.= " AND p.fk_soc = ".$user->societe_id;
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -3075,8 +3171,7 @@ 
             }
 
             return $response;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -3151,8 +3246,7 @@ 
                 $line->total_ttc=60;
                 $line->total_tva=10;
                 $line->remise_percent=50;
-            }
-            else
+            } else
             {
                 $line->total_ht=100;
                 $line->total_ttc=120;
@@ -3210,8 +3304,7 @@ 
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->error();
@@ -3262,15 +3355,13 @@ 
             if ($numref != "")
             {
                 return $numref;
-            }
-            else
+            } else
 			{
                 $this->error=$obj->error;
                 //dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
                 return "";
             }
-        }
-        else
+        } else
 		{
             $langs->load("errors");
             print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
@@ -3292,7 +3383,10 @@ 
     {
         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
 
         $result='';
         $label='';
@@ -3301,16 +3395,21 @@ 
         if ($user->rights->propal->lire)
         {
             $label = '<u>' . $langs->trans("ShowPropal") . '</u>';
-            if (! empty($this->ref))
-                $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            if (! empty($this->ref_client))
-                $label.= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-            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_client)) {
+                            $label.= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+            }
+            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.'/comm/propal/card.php?id='.$this->id. $get_params;
             }
@@ -3328,8 +3427,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';
+                }
             }
         }
 
@@ -3349,10 +3452,12 @@ 
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto)
-            $result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2)
-            $result.=' ';
+        if ($withpicto) {
+                    $result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+                    $result.=' ';
+        }
         $result.=$linkstart.$this->ref.$linkend;
         return $result;
     }
@@ -3449,8 +3554,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -3707,8 +3811,7 @@ 
 			$this->db->free($result);
 
             return 1;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -3731,26 +3834,66 @@ 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->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) || ! is_numeric($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 (! is_numeric($this->qty)) $this->qty = 0;
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=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) || ! is_numeric($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 (! is_numeric($this->qty)) {
+			$this->qty = 0;
+		}
+        if (empty($this->pa_ht)) {
+        	$this->pa_ht=0;
+        }
+        if (empty($this->multicurrency_subprice)) {
+        	$this->multicurrency_subprice=0;
+        }
+        if (empty($this->multicurrency_total_ht)) {
+        	$this->multicurrency_total_ht=0;
+        }
+        if (empty($this->multicurrency_total_tva)) {
+        	$this->multicurrency_total_tva=0;
+        }
+        if (empty($this->multicurrency_total_ttc)) {
+        	$this->multicurrency_total_ttc=0;
+        }
 
        // if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -3758,15 +3901,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();
 
@@ -3823,9 +3967,11 @@ 
         {
             $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
 
-            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)
             	{
@@ -3847,8 +3993,7 @@ 
 
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error()." sql=".$sql;
             $this->db->rollback();
@@ -3875,9 +4020,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)
         		{
@@ -3901,8 +4048,7 @@ 
             $this->db->commit();
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error()." sql=".$sql;
             $this->db->rollback();
@@ -3925,24 +4071,62 @@ 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->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->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 && $pa_ht_isemptystring)
@@ -3950,8 +4134,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -3986,9 +4169,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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
         $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
 	    $sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
@@ -4005,9 +4192,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)
         		{
@@ -4029,8 +4218,7 @@ 
 
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -4062,8 +4250,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();

htdocs/commande/class/commande.class.php

Doc Comments +8 added lines, -8 removed lines

@@ -1207,14 +1207,14 @@ 
      *	@param      float			$pu_ht    	        Unit price (without tax)
      *	@param      float			$qty             	Quantite
      *	@param      float			$txtva           	Taux de tva force, sinon -1
-     *	@param      float			$txlocaltax1		Local tax 1 rate
-     *	@param      float			$txlocaltax2		Local tax 2 rate
+     *	@param      integer			$txlocaltax1		Local tax 1 rate
+     *	@param      integer			$txlocaltax2		Local tax 2 rate
      *	@param      int				$fk_product      	Id of product
-     *	@param      float			$remise_percent  	Pourcentage de remise de la ligne
+     *	@param      integer			$remise_percent  	Pourcentage de remise de la ligne
      *	@param      int				$info_bits			Bits de type de lignes
      *	@param      int				$fk_remise_except	Id remise
      *	@param      string			$price_base_type	HT or TTC
-     *	@param      float			$pu_ttc    		    Prix unitaire TTC
+     *	@param      integer			$pu_ttc    		    Prix unitaire TTC
      *	@param      int				$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
      *	@param      int				$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
      *	@param      int				$type				Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
@@ -1224,11 +1224,11 @@ 
      *  @param		int				$fk_fournprice		Id supplier price
      *  @param		int				$pa_ht				Buying price (without tax)
      *  @param		string			$label				Label
-	 *  @param		array			$array_options		extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+	 *  @param		integer			$array_options		extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
      * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
      * 	@param		string		    $origin				'order', ...
      *  @param		int			    $origin_id			Id of origin object
-	 * 	@param		double			$pu_ht_devise		Unit price in currency
+	 * 	@param		integer			$pu_ht_devise		Unit price in currency
      *	@return     int             					>0 if OK, <0 if KO
      *
      *	@see        add_product
@@ -2775,9 +2775,9 @@ 
      *  @param		int				$pa_ht				Price (without tax) of product when it was bought
      *  @param		string			$label				Label
      *  @param		int				$special_code		Special code (also used by externals modules!)
-	 *  @param		array			$array_options		extrafields array
+	 *  @param		integer			$array_options		extrafields array
      * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
-	 *  @param		double			$pu_ht_devise		Amount in currency
+	 *  @param		integer			$pu_ht_devise		Amount in currency
      * 	@param		int				$notrigger			disable line update trigger
      *  @return   	int              					< 0 if KO, > 0 if OK
      */

Indentation +3554 added lines, -3554 removed lines

@@ -41,100 +41,100 @@ 
  */
 class Commande extends CommonOrder
 {
-    public $element='commande';
-    public $table_element='commande';
-    public $table_element_line = 'commandedet';
-    public $class_element_line = 'OrderLine';
-    public $fk_element = 'fk_commande';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto = 'order';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
+	public $element='commande';
+	public $table_element='commande';
+	public $table_element_line = 'commandedet';
+	public $class_element_line = 'OrderLine';
+	public $fk_element = 'fk_commande';
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto = 'order';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
 	/**
 	 * Client ID
 	 * @var int
 	 */
-    public $socid;
+	public $socid;
 
-    public $ref_client;
-    public $ref_int;
-    public $contactid;
+	public $ref_client;
+	public $ref_int;
+	public $contactid;
 
 	/**
 	 * Status of the order
 	 * @var int
 	 */
-    public $statut;
+	public $statut;
 	/**
 	 * @deprecated
 	 * @see billed
 	 */
-    public $facturee;
-    public $billed;		// billed or not
-
-    public $brouillon;
-    public $cond_reglement_code;
-
-    public $fk_account;
-
-    /**
-     * It holds the label of the payment mode. Use it in case translation cannot be found.
-     * @var string
-     */
-    public $mode_reglement;
-
-    /**
-     * Payment mode id
-     * @var int
-     */
-    public $mode_reglement_id;
-    /**
-     * Payment mode code
-     * @var string
-     */
-    public $mode_reglement_code;
-    /**
-     * Availability delivery time id
-     * @var int
-     */
-    public $availability_id;
-    /**
-     * Availability delivery time code
-     * @var string
-     */
-    public $availability_code;
-    /**
-     * Label of availability delivery time. Use it in case translation cannot be found.
-     * @var string
-     */
-    public $availability;
-
-    public $demand_reason_id;   // Source reason. Why we receive order (after a phone campaign, ...)
-    public $demand_reason_code;
-    public $date;				// Date commande
+	public $facturee;
+	public $billed;		// billed or not
+
+	public $brouillon;
+	public $cond_reglement_code;
+
+	public $fk_account;
+
+	/**
+	 * It holds the label of the payment mode. Use it in case translation cannot be found.
+	 * @var string
+	 */
+	public $mode_reglement;
+
+	/**
+	 * Payment mode id
+	 * @var int
+	 */
+	public $mode_reglement_id;
+	/**
+	 * Payment mode code
+	 * @var string
+	 */
+	public $mode_reglement_code;
+	/**
+	 * Availability delivery time id
+	 * @var int
+	 */
+	public $availability_id;
+	/**
+	 * Availability delivery time code
+	 * @var string
+	 */
+	public $availability_code;
+	/**
+	 * Label of availability delivery time. Use it in case translation cannot be found.
+	 * @var string
+	 */
+	public $availability;
+
+	public $demand_reason_id;   // Source reason. Why we receive order (after a phone campaign, ...)
+	public $demand_reason_code;
+	public $date;				// Date commande
 	/**
 	 * @deprecated
 	 * @see date
 	 */
-    public $date_commande;
-    public $date_livraison;	    // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
-    public $fk_remise_except;
-    public $remise_percent;
-    public $remise_absolue;
-    public $info_bits;
-    public $rang;
-    public $special_code;
-    public $source;			    // Order mode. How we received order (by phone, by email, ...)
-    public $extraparams=array();
-
-    public $linked_objects=array();
-
-    public $user_author_id;
-    public $user_valid;
+	public $date_commande;
+	public $date_livraison;	    // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+	public $fk_remise_except;
+	public $remise_percent;
+	public $remise_absolue;
+	public $info_bits;
+	public $rang;
+	public $special_code;
+	public $source;			    // Order mode. How we received order (by phone, by email, ...)
+	public $extraparams=array();
+
+	public $linked_objects=array();
+
+	public $user_author_id;
+	public $user_valid;
 
 	/**
 	 * @var OrderLine[]
@@ -151,10 +151,10 @@ 
 
 	public $oldcopy;
 
-    /**
-     * ERR Not enough stock
-     */
-    const STOCK_NOT_ENOUGH_FOR_ORDER = -3;
+	/**
+	 * ERR Not enough stock
+	 */
+	const STOCK_NOT_ENOUGH_FOR_ORDER = -3;
 
 	/**
 	 * Canceled status
@@ -182,2465 +182,2537 @@ 
 	const STATUS_CLOSED = 3;
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->remise = 0;
-        $this->remise_percent = 0;
+		$this->remise = 0;
+		$this->remise_percent = 0;
 
-        $this->products = array();
-    }
+		$this->products = array();
+	}
 
-    /**
+	/**
 	 *  Returns the reference to the following non used Order depending on the active numbering module
 	 *  defined into COMMANDE_ADDON
 	 *
 	 *  @param	Societe		$soc  	Object thirdparty
 	 *  @return string      		Order free reference
 	 */
-    function getNextNumRef($soc)
-    {
-        global $langs, $conf;
-        $langs->load("order");
+	function getNextNumRef($soc)
+	{
+		global $langs, $conf;
+		$langs->load("order");
 
-        if (! empty($conf->global->COMMANDE_ADDON))
-        {
-        	$mybool=false;
+		if (! empty($conf->global->COMMANDE_ADDON))
+		{
+			$mybool=false;
 
-        	$file = $conf->global->COMMANDE_ADDON.".php";
+			$file = $conf->global->COMMANDE_ADDON.".php";
 			$classname = $conf->global->COMMANDE_ADDON;
 
 			// Include file with class
 			$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 			foreach ($dirmodels as $reldir)
 			{
-                $dir = dol_buildpath($reldir."core/modules/commande/");
-
-                // 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 = $obj->getNextValue($soc,$this);
-
-            if ($numref != "")
-            {
-            	return $numref;
-            }
-            else
+				$dir = dol_buildpath($reldir."core/modules/commande/");
+
+				// 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 = $obj->getNextValue($soc,$this);
+
+			if ($numref != "")
+			{
+				return $numref;
+			}
+			else
 			{
 				$this->error=$obj->error;
-            	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-            	return "";
-            }
-        }
-        else
-        {
-            print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
-            return "";
-        }
-    }
-
-
-    /**
-     *	Validate order
-     *
-     *	@param		User	$user     		User making status change
-     *	@param		int		$idwarehouse	Id of warehouse to use for stock decrease
-     *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
-     */
-    function valid($user, $idwarehouse=0, $notrigger=0)
-    {
-        global $conf,$langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error=0;
-
-        // Protection
-        if ($this->statut == self::STATUS_VALIDATED)
-        {
-            dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
-            return 0;
-        }
-
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
-        {
-            $this->error='NotEnoughPermissions';
-            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        $now=dol_now();
-
-        $this->db->begin();
-
-        // Definition du nom de module de numerotation de commande
-        $soc = new Societe($this->db);
-        $soc->fetch($this->socid);
-
-        // Class of company linked to order
-        $result=$soc->set_as_client();
-
-        // 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;
-
-        // Validate
-        $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-        $sql.= " SET ref = '".$num."',";
-        $sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
-        $sql.= " date_valid='".$this->db->idate($now)."',";
-        $sql.= " fk_user_valid = ".$user->id;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql)
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->lasterror();
-            $error++;
-        }
-
-        if (! $error)
-        {
-            // If stock is incremented on validate order, we must increment it
-            if ($result >= 0 && ! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
-            {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                $langs->load("agenda");
-
-                // Loop on each line
-                $cpt=count($this->lines);
-                for ($i = 0; $i < $cpt; $i++)
-                {
-                    if ($this->lines[$i]->fk_product > 0)
-                    {
-                        $mouvP = new MouvementStock($this->db);
-						$mouvP->origin = &$this;
-                        // We decrement stock of product (and sub-products)
-                        $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num));
-                        if ($result < 0)
-                        {
-                        	$error++;
-                        	$this->error=$mouvP->error;
-                        }
-                    }
-                    if ($error) break;
-                }
-            }
-        }
-
-        if (! $error && ! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('ORDER_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))
-            {
-            	// On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
-                // in order not to lose the attachments
-                $oldref = dol_sanitizeFileName($this->ref);
-                $newref = dol_sanitizeFileName($num);
-                $dirsource = $conf->commande->dir_output.'/'.$oldref;
-                $dirdest = $conf->commande->dir_output.'/'.$newref;
-                if (file_exists($dirsource))
-                {
-                    dol_syslog(get_class($this)."::valid() 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->commande->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);
-                        }
-                    }
-                }
-            }
-        }
-
-        // Set new ref and current status
-        if (! $error)
-        {
-            $this->ref = $num;
-            $this->statut = self::STATUS_VALIDATED;
-        }
-
-        if (! $error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
+				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				return "";
+			}
+		}
+		else
 		{
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Set draft status
-     *
-     *	@param	User	$user			Object user that modify
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change.
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    function set_draft($user, $idwarehouse=-1)
-    {
-        global $conf,$langs;
-
-        $error=0;
-
-        // Protection
-        if ($this->statut <= self::STATUS_DRAFT)
-        {
-            return 0;
-        }
-
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
-        {
-            $this->error='Permission denied';
-            return -1;
-        }
-
-        $this->db->begin();
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-        $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            // If stock is decremented on validate order, we must reincrement it
-            if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
-            {
-                $result = 0;
-
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                $langs->load("agenda");
-
-                $num=count($this->lines);
-                for ($i = 0; $i < $num; $i++)
-                {
-                    if ($this->lines[$i]->fk_product > 0)
-                    {
-                        $mouvP = new MouvementStock($this->db);
-                        $mouvP->origin = &$this;
-                        // We increment stock of product (and sub-products)
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
-                        if ($result < 0) { $error++; $this->error=$mouvP->error; break; }
-                    }
-                }
-            }
-
-            if (!$error) {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_UNVALIDATE',$user);
-            	if ($result < 0) $error++;
-            }
-
-            if (!$error) {
-           		$this->statut=self::STATUS_DRAFT;
-            	$this->db->commit();
-            	return 1;
-            }else {
-            	$this->db->rollback();
-            	return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Tag the order as validated (opened)
-     *	Function used when order is reopend after being closed.
-     *
-     *	@param      User	$user       Object user that change status
-     *	@return     int         		<0 if KO, 0 if nothing is done, >0 if OK
-     */
-    function set_reopen($user)
-    {
-        $error=0;
-
-        if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
-        {
-        	dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
-            return 0;
-        }
-
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-        $sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
-        $sql.= ' WHERE rowid = '.$this->id;
-
-        dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Call trigger
-            $result=$this->call_trigger('ORDER_REOPEN',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error=$this->db->lasterror();
-            dol_print_error($this->db);
-        }
-
-        if (! $error)
-        {
-        	$this->statut = self::STATUS_VALIDATED;
-        	$this->billed = 0;
-        	$this->facturee = 0; // deprecated
-
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-	        foreach($this->errors as $errmsg)
-	        {
-		        dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
-	        }
-	        $this->db->rollback();
-	        return -1*$error;
-        }
-    }
-
-    /**
-     *  Close order
-     *
-     * 	@param      User	$user       Objet user that close
-     *	@return		int					<0 if KO, >0 if OK
-     */
-    function cloture($user)
-    {
-        global $conf;
-
-        $error=0;
-
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
-        {
-            $this->db->begin();
-
-            $now=dol_now();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET fk_statut = '.self::STATUS_CLOSED.',';
-            $sql.= ' fk_user_cloture = '.$user->id.',';
-            $sql.= " date_cloture = '".$this->db->idate($now)."'";
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
-
-            if ($this->db->query($sql))
-            {
-	            // Call trigger
-	            $result=$this->call_trigger('ORDER_CLOSE',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
-
-                if (! $error)
-                {
-                	$this->statut=self::STATUS_CLOSED;
-
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error=$this->db->lasterror();
-
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
-
-    /**
-     * 	Cancel an order
-     * 	If stock is decremented on order validation, we must reincrement it
-     *
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change.
-     *	@return	int						<0 if KO, >0 if OK
-     */
-	function cancel($idwarehouse=-1)
+			print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
+			return "";
+		}
+	}
+
+
+	/**
+	 *	Validate order
+	 *
+	 *	@param		User	$user     		User making status change
+	 *	@param		int		$idwarehouse	Id of warehouse to use for stock decrease
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	function valid($user, $idwarehouse=0, $notrigger=0)
 	{
-		global $conf,$user,$langs;
+		global $conf,$langs;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error=0;
 
+		// Protection
+		if ($this->statut == self::STATUS_VALIDATED)
+		{
+			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
+		{
+			$this->error='NotEnoughPermissions';
+			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$now=dol_now();
+
 		$this->db->begin();
 
+		// Definition du nom de module de numerotation de commande
+		$soc = new Societe($this->db);
+		$soc->fetch($this->socid);
+
+		// Class of company linked to order
+		$result=$soc->set_as_client();
+
+		// 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;
+
+		// Validate
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql.= " SET fk_statut = ".self::STATUS_CANCELED;
+		$sql.= " SET ref = '".$num."',";
+		$sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
+		$sql.= " date_valid='".$this->db->idate($now)."',";
+		$sql.= " fk_user_valid = ".$user->id;
 		$sql.= " WHERE rowid = ".$this->id;
-		$sql.= " AND fk_statut = ".self::STATUS_VALIDATED;
 
-		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
-		if ($this->db->query($sql))
+		dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql)
 		{
-			// If stock is decremented on validate order, we must reincrement it
-			if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+			dol_print_error($this->db);
+			$this->error=$this->db->lasterror();
+			$error++;
+		}
+
+		if (! $error)
+		{
+			// If stock is incremented on validate order, we must increment it
+			if ($result >= 0 && ! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
-				$num=count($this->lines);
-				for ($i = 0; $i < $num; $i++)
+				// Loop on each line
+				$cpt=count($this->lines);
+				for ($i = 0; $i < $cpt; $i++)
 				{
 					if ($this->lines[$i]->fk_product > 0)
 					{
 						$mouvP = new MouvementStock($this->db);
-						// We increment stock of product (and sub-products)
-						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr",$this->ref));  // price is 0, we don't want WAP to be changed
+						$mouvP->origin = &$this;
+						// We decrement stock of product (and sub-products)
+						$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num));
 						if ($result < 0)
 						{
 							$error++;
 							$this->error=$mouvP->error;
-							break;
 						}
 					}
+					if ($error) break;
 				}
 			}
+		}
 
-			if (! $error)
-			{
-	            // Call trigger
-	            $result=$this->call_trigger('ORDER_CANCEL',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
-			}
+		if (! $error && ! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('ORDER_VALIDATE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-			if (! $error)
-			{
-				$this->statut=self::STATUS_CANCELED;
-				$this->db->commit();
-				return 1;
-			}
-			else
+		if (! $error)
+		{
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref))
 			{
-				foreach($this->errors as $errmsg)
+				// On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
+				// in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->commande->dir_output.'/'.$oldref;
+				$dirdest = $conf->commande->dir_output.'/'.$newref;
+				if (file_exists($dirsource))
 				{
-					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
-					$this->error.=($this->error?', '.$errmsg:$errmsg);
+					dol_syslog(get_class($this)."::valid() 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->commande->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->db->rollback();
-				return -1*$error;
 			}
 		}
+
+		// Set new ref and current status
+		if (! $error)
+		{
+			$this->ref = $num;
+			$this->statut = self::STATUS_VALIDATED;
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
 		else
 		{
-			$this->error=$this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
-    /**
-     *	Create order
-     *	Note that this->ref can be set or empty. If empty, we will use "(PROV)"
-     *
-     *	@param		User	$user 		Objet user that make creation
-     *	@param		int	    $notrigger	Disable all triggers
-     *	@return 	int			        <0 if KO, >0 if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        global $conf,$langs;
-        $error=0;
-
-        // Clean parameters
-        $this->brouillon = 1;		// set command as draft
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function set_draft($user, $idwarehouse=-1)
+	{
+		global $conf,$langs;
+
+		$error=0;
 
-		// $date_commande is deprecated
-        $date = ($this->date_commande ? $this->date_commande : $this->date);
+		// Protection
+		if ($this->statut <= self::STATUS_DRAFT)
+		{
+			return 0;
+		}
 
-		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
+		if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
 		{
-			$this->multicurrency_code = $conf->currency;
-			$this->fk_multicurrency = 0;
-			$this->multicurrency_tx = 1;
+			$this->error='Permission denied';
+			return -1;
 		}
 
-        dol_syslog(get_class($this)."::create user=".$user->id);
-
-        // 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
-    		if ($result > 0)
-    		{
-    			$this->error='ErrorRefAlreadyExists';
-    			dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING);
-    			$this->db->rollback();
-    			return -1;
-    		}
-    	}
-
-        $soc = new Societe($this->db);
-        $result=$soc->fetch($this->socid);
-        if ($result < 0)
-        {
-            $this->error="Failed to fetch company";
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -2;
-        }
-        if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
-        {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        $now=dol_now();
-
-        $this->db->begin();
-
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
-        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
-        $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_warehouse";
-        $sql.= ", remise_absolue, remise_percent";
-        $sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", entity";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ")";
-        $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
-        $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
-        $sql.= ", '".$this->db->idate($date)."'";
-        $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->db->escape($this->source):'null');
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
-        $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
-        $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-        $sql.= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql.= ", ".($this->cond_reglement_id>0?$this->cond_reglement_id:"null");
-        $sql.= ", ".($this->mode_reglement_id>0?$this->mode_reglement_id:"null");
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".($this->availability_id>0?$this->availability_id:"null");
-        $sql.= ", ".($this->demand_reason_id>0?$this->demand_reason_id:"null");
-        $sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:'NULL');
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".($this->warehouse_id>0?$this->warehouse_id:'NULL');
-        $sql.= ", ".($this->remise_absolue>0?$this->db->escape($this->remise_absolue):'NULL');
-        $sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-        $sql.= ", ".$conf->entity;
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+		$this->db->begin();
 
-        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.'commande');
+		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+		$sql.= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql.= " WHERE rowid = ".$this->id;
 
-            if ($this->id)
-            {
-                $fk_parent_line=0;
-                $num=count($this->lines);
+		dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			// If stock is decremented on validate order, we must reincrement it
+			if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+			{
+				$result = 0;
 
-                /*
-                 *  Insert products details into db
-                 */
-                for ($i=0;$i<$num;$i++)
-                {
-                	$line = $this->lines[$i];
-
-                	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
-
-                    // Reset fk_parent_line for no child products and special product
-                    if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
-                        $fk_parent_line = 0;
-                    }
-
-                    $result = $this->addline(
-                        $line->desc,
-                        $line->subprice,
-                        $line->qty,
-                        $line->tva_tx,
-                        $line->localtax1_tx,
-                        $line->localtax2_tx,
-                        $line->fk_product,
-                        $line->remise_percent,
-                        $line->info_bits,
-                        $line->fk_remise_except,
-                        'HT',
-                        0,
-                        $line->date_start,
-                        $line->date_end,
-                        $line->product_type,
-                        $line->rang,
-                        $line->special_code,
-                        $fk_parent_line,
-                        $line->fk_fournprice,
-                        $line->pa_ht,
-                    	$line->label,
-                    	$line->array_options,
-	                    $line->fk_unit,
-                        $this->element,
-                        $line->id
-                    );
-                    if ($result < 0)
-                    {
-                    	if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
-                    	{
-                        	$this->error=$this->db->lasterror();
-                        	dol_print_error($this->db);
-                    	}
-                        $this->db->rollback();
-                        return -1;
-                    }
-                    // Defined the new fk_parent_line
-                    if ($result > 0 && $line->product_type == 9) {
-                        $fk_parent_line = $result;
-                    }
-                }
-
-                // update ref
-                $initialref='(PROV'.$this->id.')';
-                if (! empty($this->ref)) $initialref=$this->ref;
-
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
-                if ($this->db->query($sql))
-                {
-                    if ($this->id)
-                    {
-                    	$this->ref = $initialref;
-
-                        // Add object linked
-                        if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
-                        {
-                        	foreach($this->linked_objects as $origin => $tmp_origin_id)
-                        	{
-                        	    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-                        	    {
-                        	        foreach($tmp_origin_id as $origin_id)
-                        	        {
-                        	            $ret = $this->add_object_linked($origin, $origin_id);
-                        	            if (! $ret)
-                        	            {
-                        	                dol_print_error($this->db);
-                        	                $error++;
-                        	            }
-                        	        }
-                        	    }
-                        	    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-                        	    {
-                        	        $origin_id = $tmp_origin_id;
-                        	        $ret = $this->add_object_linked($origin, $origin_id);
-                        	        if (! $ret)
-                        	        {
-                        	            dol_print_error($this->db);
-                        	            $error++;
-                        	        }
-                          	    }
-                        	}
-                        }
-
-            			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
-            			{
-            				$originforcontact = $this->origin;
-            				$originidforcontact = $this->origin_id;
-                		    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-                		    {
-                		        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-                		        $exp = new Expedition($db);
-                		        $exp->fetch($this->origin_id);
-                		        $exp->fetchObjectLinked();
-                		        if (count($exp->linkedObjectsIds['commande']) > 0)
-                		        {
-                		            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-                		            {
-                		                $originforcontact = 'commande';
-							            if (is_object($value)) $originidforcontact = $value->id;
-							            else $originidforcontact = $value;
-                		                break; // We take first one
-                		            }
-                		        }
-                		    }
-
-                		    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-                		    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
-
-                		    $resqlcontact = $this->db->query($sqlcontact);
-                		    if ($resqlcontact)
-                		    {
-                		        while($objcontact = $this->db->fetch_object($resqlcontact))
-                		        {
-        					        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-                		            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
-                		        }
-                		    }
-                		    else dol_print_error($resqlcontact);
-                		}
-                    }
-
-                    if (! $error)
-                    {
-                   		$result=$this->insertExtraFields();
-                   		if ($result < 0) $error++;
-                    }
-
-                    if (! $error && ! $notrigger)
-                    {
-			            // Call trigger
-			            $result=$this->call_trigger('ORDER_CREATE',$user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-                    }
-
-	                if (! $error)
-	                {
-		                $this->db->commit();
-		                return $this->id;
-	                }
-	                else
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+				$langs->load("agenda");
+
+				$num=count($this->lines);
+				for ($i = 0; $i < $num; $i++)
+				{
+					if ($this->lines[$i]->fk_product > 0)
 					{
-	                	$this->db->rollback();
-	                	return -1*$error;
+						$mouvP = new MouvementStock($this->db);
+						$mouvP->origin = &$this;
+						// We increment stock of product (and sub-products)
+						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
+						if ($result < 0) { $error++; $this->error=$mouvP->error; break; }
 					}
-                }
-                else
-				{
-					$this->error=$this->db->lasterror();
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-        }
-        else
-		{
-            dol_print_error($this->db);
-            $this->db->rollback();
-            return -1;
-        }
-    }
+				}
+			}
 
+			if (!$error) {
+				// Call trigger
+				$result=$this->call_trigger('ORDER_UNVALIDATE',$user);
+				if ($result < 0) $error++;
+			}
 
-    /**
-     *	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,$hookmanager;
+			if (!$error) {
+		   		$this->statut=self::STATUS_DRAFT;
+				$this->db->commit();
+				return 1;
+			}else {
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-        $error=0;
 
-        $this->context['createfromclone'] = 'createfromclone';
+	/**
+	 *	Tag the order as validated (opened)
+	 *	Function used when order is reopend after being closed.
+	 *
+	 *	@param      User	$user       Object user that change status
+	 *	@return     int         		<0 if KO, 0 if nothing is done, >0 if OK
+	 */
+	function set_reopen($user)
+	{
+		$error=0;
 
-        $this->db->begin();
+		if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
+		{
+			dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
+			return 0;
+		}
 
-		// get lines so they will be clone
-		foreach($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+		$this->db->begin();
 
-        // Load source object
-        $objFrom = clone $this;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+		$sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
+		$sql.= ' WHERE rowid = '.$this->id;
 
-        // Change socid if needed
-        if (! empty($socid) && $socid != $this->socid)
-        {
-            $objsoc = new Societe($this->db);
+		dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Call trigger
+			$result=$this->call_trigger('ORDER_REOPEN',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+		else
+		{
+			$error++;
+			$this->error=$this->db->lasterror();
+			dol_print_error($this->db);
+		}
 
-            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->fk_delivery_address	= '';
-            }
+		if (! $error)
+		{
+			$this->statut = self::STATUS_VALIDATED;
+			$this->billed = 0;
+			$this->facturee = 0; // deprecated
 
-            // TODO Change product price if multi-prices
-        }
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+	}
 
-        $this->id=0;
-		$this->ref = '';
-        $this->statut=self::STATUS_DRAFT;
+	/**
+	 *  Close order
+	 *
+	 * 	@param      User	$user       Objet user that close
+	 *	@return		int					<0 if KO, >0 if OK
+	 */
+	function cloture($user)
+	{
+		global $conf;
 
-        // Clear fields
-        $this->user_author_id     = $user->id;
-        $this->user_valid         = '';
-		$this->date				  = dol_now();
-		$this->date_commande	  = dol_now();
-        $this->date_creation      = '';
-        $this->date_validation    = '';
-        $this->ref_client         = '';
-
-        // 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('ORDER_CLONE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-
-        unset($this->context['createfromclone']);
-
-        // End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Load an object from a proposal and create a new order into database
-     *
-     *  @param      Object			$object 	        Object source
-     *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
-     */
-    function createFromProposal($object)
-    {
-        global $conf,$user,$hookmanager;
+		$error=0;
 
-		dol_include_once('/core/class/extrafields.class.php');
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
+		{
+			$this->db->begin();
 
-        $error=0;
-
-
-        $this->date_commande = dol_now();
-        $this->source = 0;
-
-        $num=count($object->lines);
-        for ($i = 0; $i < $num; $i++)
-        {
-            $line = new OrderLine($this->db);
-
-            $line->libelle           = $object->lines[$i]->libelle;
-            $line->label             = $object->lines[$i]->label;
-            $line->desc              = $object->lines[$i]->desc;
-            $line->price             = $object->lines[$i]->price;
-            $line->subprice          = $object->lines[$i]->subprice;
-            $line->vat_src_code      = $object->lines[$i]->vat_src_code;
-            $line->tva_tx            = $object->lines[$i]->tva_tx;
-            $line->localtax1_tx      = $object->lines[$i]->localtax1_tx;
-            $line->localtax2_tx      = $object->lines[$i]->localtax2_tx;
-            $line->qty               = $object->lines[$i]->qty;
-            $line->fk_remise_except  = $object->lines[$i]->fk_remise_except;
-            $line->remise_percent    = $object->lines[$i]->remise_percent;
-            $line->fk_product        = $object->lines[$i]->fk_product;
-            $line->info_bits         = $object->lines[$i]->info_bits;
-            $line->product_type      = $object->lines[$i]->product_type;
-            $line->rang              = $object->lines[$i]->rang;
-            $line->special_code      = $object->lines[$i]->special_code;
-            $line->fk_parent_line    = $object->lines[$i]->fk_parent_line;
-	        $line->fk_unit			 = $object->lines[$i]->fk_unit;
-
-            $line->date_start      	= $object->lines[$i]->date_start;
-            $line->date_end    		= $object->lines[$i]->date_end;
+			$now=dol_now();
 
-			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
-			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
-			$line->pa_ht			= $marginInfos[0];
-			$line->marge_tx			= $marginInfos[1];
-			$line->marque_tx		= $marginInfos[2];
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+			$sql.= ' SET fk_statut = '.self::STATUS_CLOSED.',';
+			$sql.= ' fk_user_cloture = '.$user->id.',';
+			$sql.= " date_cloture = '".$this->db->idate($now)."'";
+			$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
-            // get extrafields from original line
-			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
-			foreach($object->lines[$i]->array_options as $options_key => $value)
-				$line->array_options[$options_key] = $value;
+			if ($this->db->query($sql))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_CLOSE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 
-			$this->lines[$i] = $line;
-        }
-
-        $this->socid                = $object->socid;
-        $this->fk_project           = $object->fk_project;
-        $this->cond_reglement_id    = $object->cond_reglement_id;
-        $this->mode_reglement_id    = $object->mode_reglement_id;
-        $this->fk_account           = $object->fk_account;
-        $this->availability_id      = $object->availability_id;
-        $this->demand_reason_id     = $object->demand_reason_id;
-        $this->date_livraison       = $object->date_livraison;
-        $this->shipping_method_id   = $object->shipping_method_id;
-        $this->warehouse_id         = $object->warehouse_id;
-        $this->fk_delivery_address  = $object->fk_delivery_address;
-        $this->contact_id           = $object->contactid;
-        $this->ref_client           = $object->ref_client;
-        $this->note_private         = $object->note_private;
-        $this->note_public          = $object->note_public;
-
-        $this->origin				= $object->element;
-        $this->origin_id			= $object->id;
-
-        // get extrafields from original line
-		$object->fetch_optionals($object->id);
+				if (! $error)
+				{
+					$this->statut=self::STATUS_CLOSED;
 
-		$e = new ExtraFields($this->db);
-		$element_extrafields = $e->fetch_name_optionals_label($this->element);
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
 
-		foreach($object->array_options as $options_key => $value) {
-			if(array_key_exists(str_replace('options_', '', $options_key), $element_extrafields)){
-				$this->array_options[$options_key] = $value;
+				$this->db->rollback();
+				return -1;
 			}
 		}
-        // Possibility to add external linked objects with hooks
-        $this->linked_objects[$this->origin] = $this->origin_id;
-        if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
-        {
-           	$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
-        }
-
-        $ret = $this->create($user);
-
-        if ($ret > 0)
-        {
-            // Actions hooked (by external module)
-            $hookmanager->initHooks(array('orderdao'));
-
-            $parameters=array('objFrom'=>$object);
-            $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 (! $error)
-            {
-                // Ne pas passer par la commande provisoire
-                if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1)
-                {
-                    $this->fetch($ret);
-                    $this->valid($user);
-                }
-                return $ret;
-            }
-            else return -1;
-        }
-        else return -1;
-    }
-
-
-    /**
-     *	Add an order line into database (linked to product/service or not)
-     *
-     *	@param      string			$desc            	Description of line
-     *	@param      float			$pu_ht    	        Unit price (without tax)
-     *	@param      float			$qty             	Quantite
-     *	@param      float			$txtva           	Taux de tva force, sinon -1
-     *	@param      float			$txlocaltax1		Local tax 1 rate
-     *	@param      float			$txlocaltax2		Local tax 2 rate
-     *	@param      int				$fk_product      	Id of product
-     *	@param      float			$remise_percent  	Pourcentage de remise de la ligne
-     *	@param      int				$info_bits			Bits de type de lignes
-     *	@param      int				$fk_remise_except	Id remise
-     *	@param      string			$price_base_type	HT or TTC
-     *	@param      float			$pu_ttc    		    Prix unitaire TTC
-     *	@param      int				$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-     *	@param      int				$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-     *	@param      int				$type				Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
-     *	@param      int				$rang             	Position of line
-     *	@param		int				$special_code		Special code (also used by externals modules!)
-     *	@param		int				$fk_parent_line		Parent line
-     *  @param		int				$fk_fournprice		Id supplier price
-     *  @param		int				$pa_ht				Buying price (without tax)
-     *  @param		string			$label				Label
-	 *  @param		array			$array_options		extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
-     * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
-     * 	@param		string		    $origin				'order', ...
-     *  @param		int			    $origin_id			Id of origin object
-	 * 	@param		double			$pu_ht_devise		Unit price in currency
-     *	@return     int             					>0 if OK, <0 if KO
-     *
-     *	@see        add_product
-     *
-     *	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)
-     */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise = 0)
-    {
-    	global $mysoc, $conf, $langs, $user;
-
-        dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit", LOG_DEBUG);
-
-        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($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-        if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
-    	$pa_ht=price2num($pa_ht);
-        $txtva = price2num($txtva);
-        $txlocaltax1 = price2num($txlocaltax1);
-        $txlocaltax2 = price2num($txlocaltax2);
-        if ($price_base_type=='HT')
-        {
-            $pu=$pu_ht;
-        }
-        else
-        {
-            $pu=$pu_ttc;
-        }
-        $label=trim($label);
-        $desc=trim($desc);
-
-        // Check parameters
-        if ($type < 0) return -1;
-
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            $this->db->begin();
-
-        	$product_type=$type;
-			if (!empty($fk_product))
+	}
+
+	/**
+	 * 	Cancel an order
+	 * 	If stock is decremented on order validation, we must reincrement it
+	 *
+	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function cancel($idwarehouse=-1)
+	{
+		global $conf,$user,$langs;
+
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+		$sql.= " SET fk_statut = ".self::STATUS_CANCELED;
+		$sql.= " WHERE rowid = ".$this->id;
+		$sql.= " AND fk_statut = ".self::STATUS_VALIDATED;
+
+		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			// If stock is decremented on validate order, we must reincrement it
+			if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
 			{
-				$product=new Product($this->db);
-				$result=$product->fetch($fk_product);
-				$product_type=$product->type;
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+				$langs->load("agenda");
 
-				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+				$num=count($this->lines);
+				for ($i = 0; $i < $num; $i++)
 				{
-                    $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
-					dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
-					$this->db->rollback();
-					return self::STOCK_NOT_ENOUGH_FOR_ORDER;
+					if ($this->lines[$i]->fk_product > 0)
+					{
+						$mouvP = new MouvementStock($this->db);
+						// We increment stock of product (and sub-products)
+						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr",$this->ref));  // price is 0, we don't want WAP to be changed
+						if ($result < 0)
+						{
+							$error++;
+							$this->error=$mouvP->error;
+							break;
+						}
+					}
 				}
 			}
-			// 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);
-
-       		// Clean vat code
-    		$vat_src_code='';
-    		if (preg_match('/\((.*)\)/', $txtva, $reg))
-    		{
-    		    $vat_src_code = $reg[1];
-    		    $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, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
-			$pu_ht = $tabprice[3];
 
-			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
-			$pu_ht_devise = $tabprice[19];
+			if (! $error)
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_CANCEL',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->statut=self::STATUS_CANCELED;
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-            // 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 OrderLine($this->db);
-
-            $this->line->context = $this->context;
-
-            $this->line->fk_commande=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
+	/**
+	 *	Create order
+	 *	Note that this->ref can be set or empty. If empty, we will use "(PROV)"
+	 *
+	 *	@param		User	$user 		Objet user that make creation
+	 *	@param		int	    $notrigger	Disable all triggers
+	 *	@return 	int			        <0 if KO, >0 if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf,$langs;
+		$error=0;
 
-			$this->line->vat_src_code=$vat_src_code;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$localtaxes_type[1];
-            $this->line->localtax2_tx=$localtaxes_type[3];
-			$this->line->localtax1_type=$localtaxes_type[0];
-			$this->line->localtax2_type=$localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-			$this->line->product_type=$product_type;
-            $this->line->fk_remise_except=$fk_remise_except;
-            $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->origin=$origin;
-            $this->line->origin_id=$origin_id;
-            $this->line->fk_parent_line=$fk_parent_line;
-	        $this->line->fk_unit=$fk_unit;
-
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+		// Clean parameters
+		$this->brouillon = 1;		// set command as draft
 
-			$this->line->fk_fournprice = $fk_fournprice;
-			$this->line->pa_ht = $pa_ht;
+		// $date_commande is deprecated
+		$date = ($this->date_commande ? $this->date_commande : $this->date);
 
-			// Multicurrency
-			$this->line->fk_multicurrency			= $this->fk_multicurrency;
-			$this->line->multicurrency_code			= $this->multicurrency_code;
-			$this->line->multicurrency_subprice		= $pu_ht_devise;
-			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
+		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
 
-            // TODO Ne plus utiliser
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+		dol_syslog(get_class($this)."::create user=".$user->id);
 
-			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_options;
+		// 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
+			if ($result > 0)
+			{
+				$this->error='ErrorRefAlreadyExists';
+				dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING);
+				$this->db->rollback();
+				return -1;
 			}
+		}
 
-            $result=$this->line->insert($user);
-            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 commande meme
-                $result=$this->update_price(1,'auto',0,$mysoc);	// 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->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error=$this->line->error;
-                dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
-            return -3;
-        }
-    }
-
-
-    /**
-     *	Add line into array
-     *	$this->client must be loaded
-     *
-     *	@param		int				$idproduct			Product Id
-     *	@param		float			$qty				Quantity
-     *	@param		float			$remise_percent		Product discount relative
-     * 	@param    	int		$date_start         Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-     * 	@param    	int		$date_end           End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-     * 	@return    	void
-     *
-     *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
-     *			insere dans tableau $this->products
-     */
-    function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='')
-    {
-        global $conf, $mysoc;
-
-        if (! $qty) $qty = 1;
-
-        if ($idproduct > 0)
-        {
-            $prod=new Product($this->db);
-            $prod->fetch($idproduct);
-
-            $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;
-            $vat_src_code = '';     // May be defined into tva_tx
-
-            $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
-            $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$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 OrderLine($this->db);
-
-            $line->context = $this->context;
-
-            $line->fk_product=$idproduct;
-            $line->desc=$prod->description;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->vat_src_code=$vat_src_code;
-            $line->tva_tx=$tva_tx;
-            $line->localtax1_tx=$localtax1_tx;
-            $line->localtax2_tx=$localtax2_tx;
-            $line->ref=$prod->ref;
-            $line->libelle=$prod->label;
-            $line->product_desc=$prod->description;
-	        $line->fk_unit=$prod->fk_unit;
-
-            // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-            // Save the start and end date of the line in the object
-            if ($date_start) { $line->date_start = $date_start; }
-            if ($date_end)   { $line->date_end = $date_end; }
-
-            $this->lines[] = $line;
-
-            /** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
-             if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
-             {
-             $prod = new Product($this->db);
-             $prod->fetch($idproduct);
-             $prod -> get_sousproduits_arbo ();
-             $prods_arbo = $prod->get_each_prod();
-             if(count($prods_arbo) > 0)
-             {
-             foreach($prods_arbo as $key => $value)
-             {
-             // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
-             if(! in_array($value[1],$this->products))
-             $this->add_product($value[1], $value[0]);
+		$soc = new Societe($this->db);
+		$result=$soc->fetch($this->socid);
+		if ($result < 0)
+		{
+			$this->error="Failed to fetch company";
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -2;
+		}
+		if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -1;
+		}
 
-             }
-             }
+		$now=dol_now();
 
-             }
-             **/
-        }
-    }
-
-
-    /**
-     *	Get object and lines from database
-     *
-     *	@param      int			$id       		Id of object to load
-     * 	@param		string		$ref			Ref of object
-     * 	@param		string		$ref_ext		External reference of object
-     * 	@param		string		$ref_int		Internal reference of other object
-     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
-     */
-    function fetch($id, $ref='', $ref_ext='', $ref_int='')
-    {
-
-        // Check parameters
-        if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
-
-        $sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
-        $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
-        $sql.= ', c.fk_account';
-        $sql.= ', c.date_commande';
-        $sql.= ', c.date_livraison';
-        $sql.= ', c.fk_shipping_method';
-        $sql.= ', c.fk_warehouse';
-        $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
-        $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
-        $sql.= ', c.fk_incoterms, c.location_incoterms';
-		$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
-        $sql.= ", i.libelle as libelle_incoterms";
-        $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-        $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
-        $sql.= ', ca.code as availability_code, ca.label as availability_label';
-        $sql.= ', dr.code as demand_reason_code';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term') . ')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement') . ')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
-        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
-        if ($id)   	  $sql.= " AND c.rowid=".$id;
-        if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $this->id					= $obj->rowid;
-                $this->ref					= $obj->ref;
-                $this->ref_client			= $obj->ref_client;
-                $this->ref_customer			= $obj->ref_client;
-                $this->ref_ext				= $obj->ref_ext;
-                $this->ref_int				= $obj->ref_int;
-                $this->socid				= $obj->fk_soc;
-                $this->statut				= $obj->fk_statut;
-                $this->user_author_id		= $obj->fk_user_author;
-                $this->user_valid           = $obj->fk_user_valid;
-                $this->total_ht				= $obj->total_ht;
-                $this->total_tva			= $obj->total_tva;
-                $this->total_localtax1		= $obj->total_localtax1;
-                $this->total_localtax2		= $obj->total_localtax2;
-                $this->total_ttc			= $obj->total_ttc;
-                $this->date					= $this->db->jdate($obj->date_commande);
-                $this->date_commande		= $this->db->jdate($obj->date_commande);
-                $this->remise				= $obj->remise;
-                $this->remise_percent		= $obj->remise_percent;
-                $this->remise_absolue		= $obj->remise_absolue;
-                $this->source				= $obj->source;
-                $this->facturee				= $obj->billed;			// deprecated
-                $this->billed				= $obj->billed;
-                $this->note					= $obj->note_private;	// deprecated
-                $this->note_private			= $obj->note_private;
-                $this->note_public			= $obj->note_public;
-                $this->fk_project			= $obj->fk_projet;
-                $this->modelpdf				= $obj->model_pdf;
-                $this->mode_reglement_id	= $obj->fk_mode_reglement;
-                $this->mode_reglement_code	= $obj->mode_reglement_code;
-                $this->mode_reglement		= $obj->mode_reglement_libelle;
-                $this->cond_reglement_id	= $obj->fk_cond_reglement;
-                $this->cond_reglement_code	= $obj->cond_reglement_code;
-                $this->cond_reglement		= $obj->cond_reglement_libelle;
-                $this->cond_reglement_doc	= $obj->cond_reglement_libelle_doc;
-                $this->fk_account           = $obj->fk_account;
-                $this->availability_id		= $obj->fk_availability;
-                $this->availability_code	= $obj->availability_code;
-                $this->availability	    	= $obj->availability_label;
-                $this->demand_reason_id		= $obj->fk_input_reason;
-                $this->demand_reason_code	= $obj->demand_reason_code;
-                $this->date_livraison		= $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-                $this->warehouse_id           = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
-                $this->fk_delivery_address	= $obj->fk_delivery_address;
+		$this->db->begin();
 
-				//Incoterms
-				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;
-				$this->libelle_incoterms = $obj->libelle_incoterms;
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
+		$sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
+		$sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
+		$sql.= ", fk_shipping_method";
+		$sql.= ", fk_warehouse";
+		$sql.= ", remise_absolue, remise_percent";
+		$sql.= ", fk_incoterms, location_incoterms";
+		$sql.= ", entity";
+		$sql.= ", fk_multicurrency";
+		$sql.= ", multicurrency_code";
+		$sql.= ", multicurrency_tx";
+		$sql.= ")";
+		$sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
+		$sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
+		$sql.= ", '".$this->db->idate($date)."'";
+		$sql.= ", ".($this->source>=0 && $this->source != '' ?$this->db->escape($this->source):'null');
+		$sql.= ", '".$this->db->escape($this->note_private)."'";
+		$sql.= ", '".$this->db->escape($this->note_public)."'";
+		$sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
+		$sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
+		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
+		$sql.= ", '".$this->db->escape($this->modelpdf)."'";
+		$sql.= ", ".($this->cond_reglement_id>0?$this->cond_reglement_id:"null");
+		$sql.= ", ".($this->mode_reglement_id>0?$this->mode_reglement_id:"null");
+		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", ".($this->availability_id>0?$this->availability_id:"null");
+		$sql.= ", ".($this->demand_reason_id>0?$this->demand_reason_id:"null");
+		$sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
+		$sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:'NULL');
+		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
+		$sql.= ", ".($this->warehouse_id>0?$this->warehouse_id:'NULL');
+		$sql.= ", ".($this->remise_absolue>0?$this->db->escape($this->remise_absolue):'NULL');
+		$sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
+		$sql.= ", ".(int) $this->fk_incoterms;
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".$conf->entity;
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
+		$sql.= ")";
 
-				// 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;
+		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.'commande');
 
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
+			if ($this->id)
+			{
+				$fk_parent_line=0;
+				$num=count($this->lines);
 
-                $this->lines				= array();
+				/*
+                 *  Insert products details into db
+                 */
+				for ($i=0;$i<$num;$i++)
+				{
+					$line = $this->lines[$i];
 
-                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+					//if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
+					if (! is_object($line)) $line = (object) $line;
 
-                // Retrieve all extrafields 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);
+					// Reset fk_parent_line for no child products and special product
+					if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
+						$fk_parent_line = 0;
+					}
 
-                $this->db->free($result);
+					$result = $this->addline(
+						$line->desc,
+						$line->subprice,
+						$line->qty,
+						$line->tva_tx,
+						$line->localtax1_tx,
+						$line->localtax2_tx,
+						$line->fk_product,
+						$line->remise_percent,
+						$line->info_bits,
+						$line->fk_remise_except,
+						'HT',
+						0,
+						$line->date_start,
+						$line->date_end,
+						$line->product_type,
+						$line->rang,
+						$line->special_code,
+						$fk_parent_line,
+						$line->fk_fournprice,
+						$line->pa_ht,
+						$line->label,
+						$line->array_options,
+						$line->fk_unit,
+						$this->element,
+						$line->id
+					);
+					if ($result < 0)
+					{
+						if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
+						{
+							$this->error=$this->db->lasterror();
+							dol_print_error($this->db);
+						}
+						$this->db->rollback();
+						return -1;
+					}
+					// Defined the new fk_parent_line
+					if ($result > 0 && $line->product_type == 9) {
+						$fk_parent_line = $result;
+					}
+				}
 
-                /*
-                 * Lines
-                 */
-                $result=$this->fetch_lines();
-                if ($result < 0)
-                {
-                    return -3;
-                }
-                return 1;
-            }
-            else
-            {
-                $this->error='Order with id '.$id.' not found sql='.$sql;
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Adding line of fixed discount in the order in DB
-     *
-     *	@param     int	$idremise			Id de la remise fixe
-     *	@return    int          			>0 si ok, <0 si 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;
-            }
-
-            $line = new OrderLine($this->db);
-
-            $line->fk_commande=$this->id;
-            $line->fk_remise_except=$remise->id;
-            $line->desc=$remise->description;   	// Description ligne
-            $line->vat_src_code=$remise->vat_src_code;
-            $line->tva_tx=$remise->tva_tx;
-            $line->subprice=-$remise->amount_ht;
-            $line->price=-$remise->amount_ht;
-            $line->fk_product=0;					// Id produit predefini
-            $line->qty=1;
-            $line->remise=0;
-            $line->remise_percent=0;
-            $line->rang=-1;
-            $line->info_bits=2;
-
-            $line->total_ht  = -$remise->amount_ht;
-            $line->total_tva = -$remise->amount_tva;
-            $line->total_ttc = -$remise->amount_ttc;
-
-            $result=$line->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=$line->error;
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-
-    /**
-     *	Load array lines
-     *
-     *	@param		int		$only_product	Return only physical products
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    function fetch_lines($only_product=0)
-    {
-        $this->lines=array();
-
-        $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-        $sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
-        $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
-	    $sql.= ' l.fk_unit,';
-		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
-        $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
-        $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
-        $sql.= ' WHERE l.fk_commande = '.$this->id;
-        if ($only_product) $sql .= ' AND p.fk_product_type = 0';
-        $sql .= ' ORDER BY l.rang, l.rowid';
-
-        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
-        $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 OrderLine($this->db);
-
-                $line->rowid            = $objp->rowid;
-                $line->id               = $objp->rowid;
-                $line->fk_commande      = $objp->fk_commande;
-                $line->commande_id      = $objp->fk_commande;
-                $line->label            = $objp->custom_label;
-                $line->desc             = $objp->description;
-                $line->description      = $objp->description;		// Description line
-                $line->product_type     = $objp->product_type;
-                $line->qty              = $objp->qty;
-
-                $line->vat_src_code     = $objp->vat_src_code;
-                $line->tva_tx           = $objp->tva_tx;
-	            $line->localtax1_tx     = $objp->localtax1_tx;
-                $line->localtax2_tx     = $objp->localtax2_tx;
-	            $line->localtax1_type	= $objp->localtax1_type;
-	            $line->localtax2_type	= $objp->localtax2_type;
-	            $line->total_ht         = $objp->total_ht;
-                $line->total_ttc        = $objp->total_ttc;
-                $line->total_tva        = $objp->total_tva;
-                $line->total_localtax1  = $objp->total_localtax1;
-                $line->total_localtax2  = $objp->total_localtax2;
-                $line->subprice         = $objp->subprice;
-                $line->fk_remise_except = $objp->fk_remise_except;
-                $line->remise_percent   = $objp->remise_percent;
-                $line->price            = $objp->price;
-                $line->fk_product       = $objp->fk_product;
-				$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->rang             = $objp->rang;
-                $line->info_bits        = $objp->info_bits;
-                $line->special_code		= $objp->special_code;
-                $line->fk_parent_line	= $objp->fk_parent_line;
-
-                $line->ref				= $objp->product_ref;
-                $line->product_ref		= $objp->product_ref;
-                $line->libelle			= $objp->product_label;
-                $line->product_label	= $objp->product_label;
-                $line->product_desc     = $objp->product_desc;
-                $line->product_tobatch  = $objp->product_tobatch;
-                $line->fk_product_type  = $objp->fk_product_type;	// Produit ou service
-	            $line->fk_unit          = $objp->fk_unit;
-
-	            $line->weight           = $objp->weight;
-	            $line->weight_units     = $objp->weight_units;
-	            $line->volume           = $objp->volume;
-	            $line->volume_units     = $objp->volume_units;
-
-                $line->date_start       = $this->db->jdate($objp->date_start);
-                $line->date_end         = $this->db->jdate($objp->date_end);
+				// update ref
+				$initialref='(PROV'.$this->id.')';
+				if (! empty($this->ref)) $initialref=$this->ref;
 
-				// 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;
-				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
+				if ($this->db->query($sql))
+				{
+					if ($this->id)
+					{
+						$this->ref = $initialref;
 
-                $this->lines[$i] = $line;
-
-                $i++;
-            }
-
-            $this->db->free($result);
-
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -3;
-        }
-    }
-
-
-    /**
-     *	Return number of line with type product.
-     *
-     *	@return		int		<0 if KO, Nbr of product lines if OK
-     */
-    function getNbOfProductsLines()
-    {
-        $nb=0;
-        foreach($this->lines as $line)
-        {
-            if ($line->product_type == 0) $nb++;
-        }
-        return $nb;
-    }
-
-    /**
-     *	Return number of line with type service.
-     *
-     *	@return		int		<0 if KO, Nbr of service lines if OK
-     */
-    function getNbOfServicesLines()
-    {
-        $nb=0;
-        foreach($this->lines as $line)
-        {
-            if ($line->product_type == 1) $nb++;
-        }
-        return $nb;
-    }
-
-    /**
-     *	Load array this->expeditions of lines of shipments with nb of products sent for each order line
-     *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
-     *
-     *	@param      int		$filtre_statut      Filter on shipment status
-     * 	@return     int                			<0 if KO, Nb of lines found if OK
-     */
-    function loadExpeditions($filtre_statut=-1)
-    {
-        $this->expeditions = array();
-
-        $sql = 'SELECT cd.rowid, cd.fk_product,';
-        $sql.= ' sum(ed.qty) as qty';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
-        if ($filtre_statut >= 0) $sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
-        $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
-        $sql.= ' WHERE';
-        if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
-        $sql.= ' ed.fk_origin_line = cd.rowid';
-        $sql.= ' AND cd.fk_commande =' .$this->id;
-        if ($this->fk_product > 0) $sql.= ' AND cd.fk_product = '.$this->fk_product;
-        if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
-        $sql.= ' GROUP BY cd.rowid, cd.fk_product';
-        //print $sql;
-
-        dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->expeditions[$obj->rowid] = $obj->qty;
-                $i++;
-            }
-            $this->db->free();
-            return $num;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-
-    }
-
-    /**
-     * Returns a array with expeditions lines number
-     *
-     * @return	int		Nb of shipments
-     *
-     * TODO deprecate, move to Shipping class
-     */
-    function nb_expedition()
-    {
-        $sql = 'SELECT count(*)';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
-        $sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
-        $sql.= ' WHERE el.fk_source = '.$this->id;
-        $sql.= " AND el.fk_target = e.rowid";
-        $sql.= " AND el.targettype = 'shipping'";
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $row = $this->db->fetch_row($resql);
-            return $row[0];
-        }
-        else dol_print_error($this->db);
-    }
-
-    /**
-     *	Return a array with the pending stock by product
-     *
-     *	@param      int		$filtre_statut      Filtre sur statut
-     *	@return     int                 		0 si OK, <0 si KO
-     *
-     *	TODO		FONCTION NON FINIE A FINIR
-     */
-    function stock_array($filtre_statut=self::STATUS_CANCELED)
-    {
-        $this->stocks = array();
-
-        // Tableau des id de produit de la commande
-		$array_of_product=array();
+						// Add object linked
+						if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+						{
+							foreach($this->linked_objects as $origin => $tmp_origin_id)
+							{
+								if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+								{
+									foreach($tmp_origin_id as $origin_id)
+									{
+										$ret = $this->add_object_linked($origin, $origin_id);
+										if (! $ret)
+										{
+											dol_print_error($this->db);
+											$error++;
+										}
+									}
+								}
+								else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+								{
+									$origin_id = $tmp_origin_id;
+									$ret = $this->add_object_linked($origin, $origin_id);
+									if (! $ret)
+									{
+										dol_print_error($this->db);
+										$error++;
+									}
+						  		}
+							}
+						}
 
-        // Recherche total en stock pour chaque produit
-        // TODO $array_of_product est défini vide juste au dessus !!
-        if (count($array_of_product))
-        {
-            $sql = "SELECT fk_product, sum(ps.reel) as total";
-            $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-            $sql.= " WHERE ps.fk_product IN (".join(',',$array_of_product).")";
-            $sql.= ' GROUP BY fk_product ';
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
-                $i = 0;
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($result);
-                    $this->stocks[$obj->fk_product] = $obj->total;
-                    $i++;
-                }
-                $this->db->free();
-            }
-        }
-        return 0;
-    }
-
-    /**
-     *  Delete an order line
-     *
-     *	@param      User	$user		User object
-     *  @param      int		$lineid		Id of line to delete
-     *  @return     int        		 	>0 if OK, 0 if nothing to do, <0 if KO
-     */
-    function deleteline($user=null, $lineid=0)
-    {
-
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            $this->db->begin();
-
-            $sql = "SELECT fk_product, qty";
-            $sql.= " FROM ".MAIN_DB_PREFIX."commandedet";
-            $sql.= " WHERE rowid = ".$lineid;
-
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $obj = $this->db->fetch_object($result);
-
-                if ($obj)
-                {
-                    $product = new Product($this->db);
-                    $product->id = $obj->fk_product;
-
-                    // Delete line
-                    $line = new OrderLine($this->db);
-
-                    // For triggers
-                    $line->fetch($lineid);
-
-                    if ($line->delete($user) > 0)
-                    {
-                        $result=$this->update_price(1);
-
-                        if ($result > 0)
-                        {
-                            $this->db->commit();
-                            return 1;
-                        }
-                        else
-                        {
-                            $this->db->rollback();
-                            $this->error=$this->db->lasterror();
-                            return -1;
-                        }
-                    }
-                    else
-                    {
-                        $this->db->rollback();
-                        $this->error=$line->error;
-                        return -1;
-                    }
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return 0;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error=$this->db->lasterror();
-                return -1;
-            }
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    /**
-     * 	Applique une remise relative
-     *
-     * 	@param     	User		$user		User qui positionne la remise
-     * 	@param     	float		$remise		Discount (percent)
-     * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return		int 					<0 if KO, >0 if OK
-     */
-    function set_remise($user, $remise, $notrigger=0)
-    {
-        $remise=trim($remise)?trim($remise):0;
-
-        if ($user->rights->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $remise=price2num($remise);
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET remise_percent = '.$remise;
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->remise_percent = $remise;
-            	$this->update_price(1);
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-
-    /**
-     * 		Applique une remise absolue
-     *
-     * 		@param     	User		$user 		User qui positionne la remise
-     * 		@param     	float		$remise		Discount
-     * 		@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-     *		@return		int 					<0 if KO, >0 if OK
-     */
-    function set_remise_absolue($user, $remise, $notrigger=0)
-    {
-        $remise=trim($remise)?trim($remise):0;
-
-        if ($user->rights->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $remise=price2num($remise);
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET remise_absolue = '.$remise;
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->remise_absolue = $remise;
-            	$this->update_price(1);
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-    }
-
-
-    /**
-     *	Set the order date
-     *
-     *	@param      User	$user       Object user making change
-     *	@param      int		$date		Date
-     * 	@param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return     int         		<0 if KO, >0 if OK
-     */
-    function set_date($user, $date, $notrigger=0)
-    {
-        if ($user->rights->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-            $sql.= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->date = $date;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
-
-    /**
-     *	Set the planned delivery date
-     *
-     *	@param      User	$user        		Objet utilisateur qui modifie
-     *	@param      int		$date_livraison     Date de livraison
-     *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         				<0 si ko, >0 si ok
-     */
-    function set_date_livraison($user, $date_livraison, $notrigger=0)
-    {
-        if ($user->rights->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-            $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->date_livraison = $date_livraison;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
-
-    /**
-     *  Return list of orders (eventuelly filtered on a 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      User	$excluser      	Objet user to exclude
-     *  @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, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='c.date_commande', $sortorder='DESC')
-    {
-        global $user;
-
-        $ga = array();
-
-        $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " c.rowid as cid, c.ref";
-        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."commande as c";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
-        $sql.= " AND c.fk_soc = s.rowid";
-        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 c.fk_statut = ".self::STATUS_DRAFT;
-        if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
-        $sql.= $this->db->order($sortfield,$sortorder);
-        $sql.= $this->db->plimit($limit,$offset);
-
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            $numc = $this->db->num_rows($result);
-            if ($numc)
-            {
-                $i = 0;
-                while ($i < $numc)
-                {
-                    $obj = $this->db->fetch_object($result);
-
-                    if ($shortlist == 1)
-                    {
-                    	$ga[$obj->cid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
-                    {
-                    	$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
+						if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+						{
+							$originforcontact = $this->origin;
+							$originidforcontact = $this->origin_id;
+							if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+							{
+								require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+								$exp = new Expedition($db);
+								$exp->fetch($this->origin_id);
+								$exp->fetchObjectLinked();
+								if (count($exp->linkedObjectsIds['commande']) > 0)
+								{
+									foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+									{
+										$originforcontact = 'commande';
+										if (is_object($value)) $originidforcontact = $value->id;
+										else $originidforcontact = $value;
+										break; // We take first one
+									}
+								}
+							}
+
+							$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+							$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+
+							$resqlcontact = $this->db->query($sqlcontact);
+							if ($resqlcontact)
+							{
+								while($objcontact = $this->db->fetch_object($resqlcontact))
+								{
+									//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+									$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+								}
+							}
+							else dol_print_error($resqlcontact);
+						}
+					}
+
+					if (! $error)
+					{
+				   		$result=$this->insertExtraFields();
+				   		if ($result < 0) $error++;
+					}
+
+					if (! $error && ! $notrigger)
+					{
+						// Call trigger
+						$result=$this->call_trigger('ORDER_CREATE',$user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
+
+					if (! $error)
 					{
-                    	$ga[$i]['id']	= $obj->cid;
-                    	$ga[$i]['ref'] 	= $obj->ref;
-                    	$ga[$i]['name'] = $obj->name;
-                    }
-                    $i++;
-                }
-            }
-            return $ga;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     *	Update delivery delay
-     *
-     *	@param      int		$availability_id	Id du nouveau mode
-     *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         				>0 if OK, <0 if KO
-     */
-    function availability($availability_id, $notrigger=0)
-    {
-        global $user;
-
-        dol_syslog('Commande::availability('.$availability_id.')');
-        if ($this->statut >= self::STATUS_DRAFT)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql .= ' SET fk_availability = '.$availability_id;
-            $sql .= ' WHERE rowid='.$this->id;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->availability_id = $availability_id;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-        	$error_str='Command status do not meet requirement '.$this->statut;
-            dol_syslog(__METHOD__.$error_str, LOG_ERR);
-            $this->error=$error_str;
-            $this->errors[]= $this->error;
-            return -2;
-        }
-    }
-
-    /**
-     *	Update order demand_reason
-     *
-     *  @param      int		$demand_reason_id	Id of new demand
-     *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-     *  @return     int        			 		>0 if ok, <0 if ko
-     */
-    function demand_reason($demand_reason_id, $notrigger=0)
-    {
-        global $user;
-
-        dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
-        if ($this->statut >= self::STATUS_DRAFT)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql .= ' SET fk_input_reason = '.$demand_reason_id;
-            $sql .= ' WHERE rowid='.$this->id;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->demand_reason_id = $demand_reason_id;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-        	$error_str='order status do not meet requirement '.$this->statut;
-        	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
-            return -2;
-        }
-    }
-
-    /**
-     *	Set customer ref
-     *
-     *	@param      User	$user           User that make change
-     *	@param      string	$ref_client     Customer ref
-     *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return     int             		<0 if KO, >0 if OK
-     */
-    function set_ref_client($user, $ref_client, $notrigger=0)
-    {
-        if ($user->rights->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
-            $sql.= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
-            $sql.= ' WHERE rowid = '.$this->id;
-
-            dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->ref_client = $ref_client;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-            return -1;
-        }
-    }
+						$this->db->commit();
+						return $this->id;
+					}
+					else
+					{
+						$this->db->rollback();
+						return -1*$error;
+					}
+				}
+				else
+				{
+					$this->error=$this->db->lasterror();
+					$this->db->rollback();
+					return -1;
+				}
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	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,$hookmanager;
+
+		$error=0;
+
+		$this->context['createfromclone'] = 'createfromclone';
+
+		$this->db->begin();
+
+		// get lines so they will be clone
+		foreach($this->lines as $line)
+			$line->fetch_optionals($line->rowid);
+
+		// Load source object
+		$objFrom = clone $this;
+
+		// Change socid if needed
+		if (! empty($socid) && $socid != $this->socid)
+		{
+			$objsoc = new Societe($this->db);
+
+			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->fk_delivery_address	= '';
+			}
+
+			// TODO Change product price if multi-prices
+		}
+
+		$this->id=0;
+		$this->ref = '';
+		$this->statut=self::STATUS_DRAFT;
+
+		// Clear fields
+		$this->user_author_id     = $user->id;
+		$this->user_valid         = '';
+		$this->date				  = dol_now();
+		$this->date_commande	  = dol_now();
+		$this->date_creation      = '';
+		$this->date_validation    = '';
+		$this->ref_client         = '';
+
+		// 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('ORDER_CLONE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		unset($this->context['createfromclone']);
+
+		// End
+		if (! $error)
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Load an object from a proposal and create a new order into database
+	 *
+	 *  @param      Object			$object 	        Object source
+	 *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
+	 */
+	function createFromProposal($object)
+	{
+		global $conf,$user,$hookmanager;
+
+		dol_include_once('/core/class/extrafields.class.php');
+
+		$error=0;
+
+
+		$this->date_commande = dol_now();
+		$this->source = 0;
+
+		$num=count($object->lines);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$line = new OrderLine($this->db);
+
+			$line->libelle           = $object->lines[$i]->libelle;
+			$line->label             = $object->lines[$i]->label;
+			$line->desc              = $object->lines[$i]->desc;
+			$line->price             = $object->lines[$i]->price;
+			$line->subprice          = $object->lines[$i]->subprice;
+			$line->vat_src_code      = $object->lines[$i]->vat_src_code;
+			$line->tva_tx            = $object->lines[$i]->tva_tx;
+			$line->localtax1_tx      = $object->lines[$i]->localtax1_tx;
+			$line->localtax2_tx      = $object->lines[$i]->localtax2_tx;
+			$line->qty               = $object->lines[$i]->qty;
+			$line->fk_remise_except  = $object->lines[$i]->fk_remise_except;
+			$line->remise_percent    = $object->lines[$i]->remise_percent;
+			$line->fk_product        = $object->lines[$i]->fk_product;
+			$line->info_bits         = $object->lines[$i]->info_bits;
+			$line->product_type      = $object->lines[$i]->product_type;
+			$line->rang              = $object->lines[$i]->rang;
+			$line->special_code      = $object->lines[$i]->special_code;
+			$line->fk_parent_line    = $object->lines[$i]->fk_parent_line;
+			$line->fk_unit			 = $object->lines[$i]->fk_unit;
+
+			$line->date_start      	= $object->lines[$i]->date_start;
+			$line->date_end    		= $object->lines[$i]->date_end;
+
+			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
+			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
+			$line->pa_ht			= $marginInfos[0];
+			$line->marge_tx			= $marginInfos[1];
+			$line->marque_tx		= $marginInfos[2];
+
+			// get extrafields from original line
+			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
+			foreach($object->lines[$i]->array_options as $options_key => $value)
+				$line->array_options[$options_key] = $value;
+
+			$this->lines[$i] = $line;
+		}
+
+		$this->socid                = $object->socid;
+		$this->fk_project           = $object->fk_project;
+		$this->cond_reglement_id    = $object->cond_reglement_id;
+		$this->mode_reglement_id    = $object->mode_reglement_id;
+		$this->fk_account           = $object->fk_account;
+		$this->availability_id      = $object->availability_id;
+		$this->demand_reason_id     = $object->demand_reason_id;
+		$this->date_livraison       = $object->date_livraison;
+		$this->shipping_method_id   = $object->shipping_method_id;
+		$this->warehouse_id         = $object->warehouse_id;
+		$this->fk_delivery_address  = $object->fk_delivery_address;
+		$this->contact_id           = $object->contactid;
+		$this->ref_client           = $object->ref_client;
+		$this->note_private         = $object->note_private;
+		$this->note_public          = $object->note_public;
+
+		$this->origin				= $object->element;
+		$this->origin_id			= $object->id;
+
+		// get extrafields from original line
+		$object->fetch_optionals($object->id);
+
+		$e = new ExtraFields($this->db);
+		$element_extrafields = $e->fetch_name_optionals_label($this->element);
+
+		foreach($object->array_options as $options_key => $value) {
+			if(array_key_exists(str_replace('options_', '', $options_key), $element_extrafields)){
+				$this->array_options[$options_key] = $value;
+			}
+		}
+		// Possibility to add external linked objects with hooks
+		$this->linked_objects[$this->origin] = $this->origin_id;
+		if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
+		{
+		   	$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
+		}
+
+		$ret = $this->create($user);
+
+		if ($ret > 0)
+		{
+			// Actions hooked (by external module)
+			$hookmanager->initHooks(array('orderdao'));
+
+			$parameters=array('objFrom'=>$object);
+			$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 (! $error)
+			{
+				// Ne pas passer par la commande provisoire
+				if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1)
+				{
+					$this->fetch($ret);
+					$this->valid($user);
+				}
+				return $ret;
+			}
+			else return -1;
+		}
+		else return -1;
+	}
+
+
+	/**
+	 *	Add an order line into database (linked to product/service or not)
+	 *
+	 *	@param      string			$desc            	Description of line
+	 *	@param      float			$pu_ht    	        Unit price (without tax)
+	 *	@param      float			$qty             	Quantite
+	 *	@param      float			$txtva           	Taux de tva force, sinon -1
+	 *	@param      float			$txlocaltax1		Local tax 1 rate
+	 *	@param      float			$txlocaltax2		Local tax 2 rate
+	 *	@param      int				$fk_product      	Id of product
+	 *	@param      float			$remise_percent  	Pourcentage de remise de la ligne
+	 *	@param      int				$info_bits			Bits de type de lignes
+	 *	@param      int				$fk_remise_except	Id remise
+	 *	@param      string			$price_base_type	HT or TTC
+	 *	@param      float			$pu_ttc    		    Prix unitaire TTC
+	 *	@param      int				$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	 *	@param      int				$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	 *	@param      int				$type				Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
+	 *	@param      int				$rang             	Position of line
+	 *	@param		int				$special_code		Special code (also used by externals modules!)
+	 *	@param		int				$fk_parent_line		Parent line
+	 *  @param		int				$fk_fournprice		Id supplier price
+	 *  @param		int				$pa_ht				Buying price (without tax)
+	 *  @param		string			$label				Label
+	 *  @param		array			$array_options		extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+	 * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param		string		    $origin				'order', ...
+	 *  @param		int			    $origin_id			Id of origin object
+	 * 	@param		double			$pu_ht_devise		Unit price in currency
+	 *	@return     int             					>0 if OK, <0 if KO
+	 *
+	 *	@see        add_product
+	 *
+	 *	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)
+	 */
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise = 0)
+	{
+		global $mysoc, $conf, $langs, $user;
+
+		dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit", LOG_DEBUG);
+
+		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($txtva)) $txtva=0;
+		if (empty($txlocaltax1)) $txlocaltax1=0;
+		if (empty($txlocaltax2)) $txlocaltax2=0;
+		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+		if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
+
+		$remise_percent=price2num($remise_percent);
+		$qty=price2num($qty);
+		$pu_ht=price2num($pu_ht);
+		$pu_ttc=price2num($pu_ttc);
+		$pa_ht=price2num($pa_ht);
+		$txtva = price2num($txtva);
+		$txlocaltax1 = price2num($txlocaltax1);
+		$txlocaltax2 = price2num($txlocaltax2);
+		if ($price_base_type=='HT')
+		{
+			$pu=$pu_ht;
+		}
+		else
+		{
+			$pu=$pu_ttc;
+		}
+		$label=trim($label);
+		$desc=trim($desc);
+
+		// Check parameters
+		if ($type < 0) return -1;
+
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			$this->db->begin();
+
+			$product_type=$type;
+			if (!empty($fk_product))
+			{
+				$product=new Product($this->db);
+				$result=$product->fetch($fk_product);
+				$product_type=$product->type;
+
+				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+				{
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
+					dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
+					$this->db->rollback();
+					return self::STOCK_NOT_ENOUGH_FOR_ORDER;
+				}
+			}
+			// 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);
+
+	   		// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$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, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu_ht = $tabprice[3];
+
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
+
+			// 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 OrderLine($this->db);
+
+			$this->line->context = $this->context;
+
+			$this->line->fk_commande=$this->id;
+			$this->line->label=$label;
+			$this->line->desc=$desc;
+			$this->line->qty=$qty;
+
+			$this->line->vat_src_code=$vat_src_code;
+			$this->line->tva_tx=$txtva;
+			$this->line->localtax1_tx=$localtaxes_type[1];
+			$this->line->localtax2_tx=$localtaxes_type[3];
+			$this->line->localtax1_type=$localtaxes_type[0];
+			$this->line->localtax2_type=$localtaxes_type[2];
+			$this->line->fk_product=$fk_product;
+			$this->line->product_type=$product_type;
+			$this->line->fk_remise_except=$fk_remise_except;
+			$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->origin=$origin;
+			$this->line->origin_id=$origin_id;
+			$this->line->fk_parent_line=$fk_parent_line;
+			$this->line->fk_unit=$fk_unit;
+
+			$this->line->date_start=$date_start;
+			$this->line->date_end=$date_end;
+
+			$this->line->fk_fournprice = $fk_fournprice;
+			$this->line->pa_ht = $pa_ht;
+
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			// TODO Ne plus utiliser
+			$this->line->price=$price;
+			$this->line->remise=$remise;
+
+			if (is_array($array_options) && count($array_options)>0) {
+				$this->line->array_options=$array_options;
+			}
+
+			$result=$this->line->insert($user);
+			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 commande meme
+				$result=$this->update_price(1,'auto',0,$mysoc);	// 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->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->error=$this->line->error;
+				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
+			return -3;
+		}
+	}
+
+
+	/**
+	 *	Add line into array
+	 *	$this->client must be loaded
+	 *
+	 *	@param		int				$idproduct			Product Id
+	 *	@param		float			$qty				Quantity
+	 *	@param		float			$remise_percent		Product discount relative
+	 * 	@param    	int		$date_start         Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	 * 	@param    	int		$date_end           End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	 * 	@return    	void
+	 *
+	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
+	 *			insere dans tableau $this->products
+	 */
+	function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='')
+	{
+		global $conf, $mysoc;
+
+		if (! $qty) $qty = 1;
+
+		if ($idproduct > 0)
+		{
+			$prod=new Product($this->db);
+			$prod->fetch($idproduct);
+
+			$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;
+			$vat_src_code = '';     // May be defined into tva_tx
+
+			$localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
+			$localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$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 OrderLine($this->db);
+
+			$line->context = $this->context;
+
+			$line->fk_product=$idproduct;
+			$line->desc=$prod->description;
+			$line->qty=$qty;
+			$line->subprice=$price;
+			$line->remise_percent=$remise_percent;
+			$line->vat_src_code=$vat_src_code;
+			$line->tva_tx=$tva_tx;
+			$line->localtax1_tx=$localtax1_tx;
+			$line->localtax2_tx=$localtax2_tx;
+			$line->ref=$prod->ref;
+			$line->libelle=$prod->label;
+			$line->product_desc=$prod->description;
+			$line->fk_unit=$prod->fk_unit;
+
+			// Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+			// Save the start and end date of the line in the object
+			if ($date_start) { $line->date_start = $date_start; }
+			if ($date_end)   { $line->date_end = $date_end; }
+
+			$this->lines[] = $line;
+
+			/** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
+             if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+             {
+             $prod = new Product($this->db);
+             $prod->fetch($idproduct);
+             $prod -> get_sousproduits_arbo ();
+             $prods_arbo = $prod->get_each_prod();
+             if(count($prods_arbo) > 0)
+             {
+             foreach($prods_arbo as $key => $value)
+             {
+             // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
+             if(! in_array($value[1],$this->products))
+             $this->add_product($value[1], $value[0]);
+
+             }
+             }
+
+             }
+			 **/
+		}
+	}
+
+
+	/**
+	 *	Get object and lines from database
+	 *
+	 *	@param      int			$id       		Id of object to load
+	 * 	@param		string		$ref			Ref of object
+	 * 	@param		string		$ref_ext		External reference of object
+	 * 	@param		string		$ref_int		Internal reference of other object
+	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+	 */
+	function fetch($id, $ref='', $ref_ext='', $ref_int='')
+	{
+
+		// Check parameters
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+
+		$sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
+		$sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
+		$sql.= ', c.fk_account';
+		$sql.= ', c.date_commande';
+		$sql.= ', c.date_livraison';
+		$sql.= ', c.fk_shipping_method';
+		$sql.= ', c.fk_warehouse';
+		$sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
+		$sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
+		$sql.= ', c.fk_incoterms, c.location_incoterms';
+		$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
+		$sql.= ", i.libelle as libelle_incoterms";
+		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
+		$sql.= ', ca.code as availability_code, ca.label as availability_label';
+		$sql.= ', dr.code as demand_reason_code';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term') . ')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement') . ')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
+		$sql.= " WHERE c.entity IN (".getEntity('commande').")";
+		if ($id)   	  $sql.= " AND c.rowid=".$id;
+		if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$this->id					= $obj->rowid;
+				$this->ref					= $obj->ref;
+				$this->ref_client			= $obj->ref_client;
+				$this->ref_customer			= $obj->ref_client;
+				$this->ref_ext				= $obj->ref_ext;
+				$this->ref_int				= $obj->ref_int;
+				$this->socid				= $obj->fk_soc;
+				$this->statut				= $obj->fk_statut;
+				$this->user_author_id		= $obj->fk_user_author;
+				$this->user_valid           = $obj->fk_user_valid;
+				$this->total_ht				= $obj->total_ht;
+				$this->total_tva			= $obj->total_tva;
+				$this->total_localtax1		= $obj->total_localtax1;
+				$this->total_localtax2		= $obj->total_localtax2;
+				$this->total_ttc			= $obj->total_ttc;
+				$this->date					= $this->db->jdate($obj->date_commande);
+				$this->date_commande		= $this->db->jdate($obj->date_commande);
+				$this->remise				= $obj->remise;
+				$this->remise_percent		= $obj->remise_percent;
+				$this->remise_absolue		= $obj->remise_absolue;
+				$this->source				= $obj->source;
+				$this->facturee				= $obj->billed;			// deprecated
+				$this->billed				= $obj->billed;
+				$this->note					= $obj->note_private;	// deprecated
+				$this->note_private			= $obj->note_private;
+				$this->note_public			= $obj->note_public;
+				$this->fk_project			= $obj->fk_projet;
+				$this->modelpdf				= $obj->model_pdf;
+				$this->mode_reglement_id	= $obj->fk_mode_reglement;
+				$this->mode_reglement_code	= $obj->mode_reglement_code;
+				$this->mode_reglement		= $obj->mode_reglement_libelle;
+				$this->cond_reglement_id	= $obj->fk_cond_reglement;
+				$this->cond_reglement_code	= $obj->cond_reglement_code;
+				$this->cond_reglement		= $obj->cond_reglement_libelle;
+				$this->cond_reglement_doc	= $obj->cond_reglement_libelle_doc;
+				$this->fk_account           = $obj->fk_account;
+				$this->availability_id		= $obj->fk_availability;
+				$this->availability_code	= $obj->availability_code;
+				$this->availability	    	= $obj->availability_label;
+				$this->demand_reason_id		= $obj->fk_input_reason;
+				$this->demand_reason_code	= $obj->demand_reason_code;
+				$this->date_livraison		= $this->db->jdate($obj->date_livraison);
+				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+				$this->warehouse_id           = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
+				$this->fk_delivery_address	= $obj->fk_delivery_address;
+
+				//Incoterms
+				$this->fk_incoterms = $obj->fk_incoterms;
+				$this->location_incoterms = $obj->location_incoterms;
+				$this->libelle_incoterms = $obj->libelle_incoterms;
+
+				// 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;
+
+				$this->extraparams			= (array) json_decode($obj->extraparams, true);
+
+				$this->lines				= array();
+
+				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+
+				// Retrieve all extrafields 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($result);
+
+				/*
+                 * Lines
+                 */
+				$result=$this->fetch_lines();
+				if ($result < 0)
+				{
+					return -3;
+				}
+				return 1;
+			}
+			else
+			{
+				$this->error='Order with id '.$id.' not found sql='.$sql;
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Adding line of fixed discount in the order in DB
+	 *
+	 *	@param     int	$idremise			Id de la remise fixe
+	 *	@return    int          			>0 si ok, <0 si 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;
+			}
+
+			$line = new OrderLine($this->db);
+
+			$line->fk_commande=$this->id;
+			$line->fk_remise_except=$remise->id;
+			$line->desc=$remise->description;   	// Description ligne
+			$line->vat_src_code=$remise->vat_src_code;
+			$line->tva_tx=$remise->tva_tx;
+			$line->subprice=-$remise->amount_ht;
+			$line->price=-$remise->amount_ht;
+			$line->fk_product=0;					// Id produit predefini
+			$line->qty=1;
+			$line->remise=0;
+			$line->remise_percent=0;
+			$line->rang=-1;
+			$line->info_bits=2;
+
+			$line->total_ht  = -$remise->amount_ht;
+			$line->total_tva = -$remise->amount_tva;
+			$line->total_ttc = -$remise->amount_ttc;
+
+			$result=$line->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=$line->error;
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+
+	/**
+	 *	Load array lines
+	 *
+	 *	@param		int		$only_product	Return only physical products
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	function fetch_lines($only_product=0)
+	{
+		$this->lines=array();
+
+		$sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
+		$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
+		$sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
+		$sql.= ' l.fk_unit,';
+		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
+		$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
+		$sql.= ' p.weight, p.weight_units, p.volume, p.volume_units';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
+		$sql.= ' WHERE l.fk_commande = '.$this->id;
+		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		$sql .= ' ORDER BY l.rang, l.rowid';
+
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+		$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 OrderLine($this->db);
+
+				$line->rowid            = $objp->rowid;
+				$line->id               = $objp->rowid;
+				$line->fk_commande      = $objp->fk_commande;
+				$line->commande_id      = $objp->fk_commande;
+				$line->label            = $objp->custom_label;
+				$line->desc             = $objp->description;
+				$line->description      = $objp->description;		// Description line
+				$line->product_type     = $objp->product_type;
+				$line->qty              = $objp->qty;
+
+				$line->vat_src_code     = $objp->vat_src_code;
+				$line->tva_tx           = $objp->tva_tx;
+				$line->localtax1_tx     = $objp->localtax1_tx;
+				$line->localtax2_tx     = $objp->localtax2_tx;
+				$line->localtax1_type	= $objp->localtax1_type;
+				$line->localtax2_type	= $objp->localtax2_type;
+				$line->total_ht         = $objp->total_ht;
+				$line->total_ttc        = $objp->total_ttc;
+				$line->total_tva        = $objp->total_tva;
+				$line->total_localtax1  = $objp->total_localtax1;
+				$line->total_localtax2  = $objp->total_localtax2;
+				$line->subprice         = $objp->subprice;
+				$line->fk_remise_except = $objp->fk_remise_except;
+				$line->remise_percent   = $objp->remise_percent;
+				$line->price            = $objp->price;
+				$line->fk_product       = $objp->fk_product;
+				$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->rang             = $objp->rang;
+				$line->info_bits        = $objp->info_bits;
+				$line->special_code		= $objp->special_code;
+				$line->fk_parent_line	= $objp->fk_parent_line;
+
+				$line->ref				= $objp->product_ref;
+				$line->product_ref		= $objp->product_ref;
+				$line->libelle			= $objp->product_label;
+				$line->product_label	= $objp->product_label;
+				$line->product_desc     = $objp->product_desc;
+				$line->product_tobatch  = $objp->product_tobatch;
+				$line->fk_product_type  = $objp->fk_product_type;	// Produit ou service
+				$line->fk_unit          = $objp->fk_unit;
+
+				$line->weight           = $objp->weight;
+				$line->weight_units     = $objp->weight_units;
+				$line->volume           = $objp->volume;
+				$line->volume_units     = $objp->volume_units;
+
+				$line->date_start       = $this->db->jdate($objp->date_start);
+				$line->date_end         = $this->db->jdate($objp->date_end);
+
+				// 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;
+				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+
+				$this->lines[$i] = $line;
+
+				$i++;
+			}
+
+			$this->db->free($result);
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -3;
+		}
+	}
+
+
+	/**
+	 *	Return number of line with type product.
+	 *
+	 *	@return		int		<0 if KO, Nbr of product lines if OK
+	 */
+	function getNbOfProductsLines()
+	{
+		$nb=0;
+		foreach($this->lines as $line)
+		{
+			if ($line->product_type == 0) $nb++;
+		}
+		return $nb;
+	}
+
+	/**
+	 *	Return number of line with type service.
+	 *
+	 *	@return		int		<0 if KO, Nbr of service lines if OK
+	 */
+	function getNbOfServicesLines()
+	{
+		$nb=0;
+		foreach($this->lines as $line)
+		{
+			if ($line->product_type == 1) $nb++;
+		}
+		return $nb;
+	}
+
+	/**
+	 *	Load array this->expeditions of lines of shipments with nb of products sent for each order line
+	 *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
+	 *
+	 *	@param      int		$filtre_statut      Filter on shipment status
+	 * 	@return     int                			<0 if KO, Nb of lines found if OK
+	 */
+	function loadExpeditions($filtre_statut=-1)
+	{
+		$this->expeditions = array();
+
+		$sql = 'SELECT cd.rowid, cd.fk_product,';
+		$sql.= ' sum(ed.qty) as qty';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
+		if ($filtre_statut >= 0) $sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
+		$sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
+		$sql.= ' WHERE';
+		if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
+		$sql.= ' ed.fk_origin_line = cd.rowid';
+		$sql.= ' AND cd.fk_commande =' .$this->id;
+		if ($this->fk_product > 0) $sql.= ' AND cd.fk_product = '.$this->fk_product;
+		if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
+		$sql.= ' GROUP BY cd.rowid, cd.fk_product';
+		//print $sql;
+
+		dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->expeditions[$obj->rowid] = $obj->qty;
+				$i++;
+			}
+			$this->db->free();
+			return $num;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+
+	}
+
+	/**
+	 * Returns a array with expeditions lines number
+	 *
+	 * @return	int		Nb of shipments
+	 *
+	 * TODO deprecate, move to Shipping class
+	 */
+	function nb_expedition()
+	{
+		$sql = 'SELECT count(*)';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
+		$sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
+		$sql.= ' WHERE el.fk_source = '.$this->id;
+		$sql.= " AND el.fk_target = e.rowid";
+		$sql.= " AND el.targettype = 'shipping'";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$row = $this->db->fetch_row($resql);
+			return $row[0];
+		}
+		else dol_print_error($this->db);
+	}
+
+	/**
+	 *	Return a array with the pending stock by product
+	 *
+	 *	@param      int		$filtre_statut      Filtre sur statut
+	 *	@return     int                 		0 si OK, <0 si KO
+	 *
+	 *	TODO		FONCTION NON FINIE A FINIR
+	 */
+	function stock_array($filtre_statut=self::STATUS_CANCELED)
+	{
+		$this->stocks = array();
+
+		// Tableau des id de produit de la commande
+		$array_of_product=array();
+
+		// Recherche total en stock pour chaque produit
+		// TODO $array_of_product est défini vide juste au dessus !!
+		if (count($array_of_product))
+		{
+			$sql = "SELECT fk_product, sum(ps.reel) as total";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+			$sql.= " WHERE ps.fk_product IN (".join(',',$array_of_product).")";
+			$sql.= ' GROUP BY fk_product ';
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					$this->stocks[$obj->fk_product] = $obj->total;
+					$i++;
+				}
+				$this->db->free();
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 *  Delete an order line
+	 *
+	 *	@param      User	$user		User object
+	 *  @param      int		$lineid		Id of line to delete
+	 *  @return     int        		 	>0 if OK, 0 if nothing to do, <0 if KO
+	 */
+	function deleteline($user=null, $lineid=0)
+	{
+
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			$this->db->begin();
+
+			$sql = "SELECT fk_product, qty";
+			$sql.= " FROM ".MAIN_DB_PREFIX."commandedet";
+			$sql.= " WHERE rowid = ".$lineid;
+
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$obj = $this->db->fetch_object($result);
+
+				if ($obj)
+				{
+					$product = new Product($this->db);
+					$product->id = $obj->fk_product;
+
+					// Delete line
+					$line = new OrderLine($this->db);
+
+					// For triggers
+					$line->fetch($lineid);
+
+					if ($line->delete($user) > 0)
+					{
+						$result=$this->update_price(1);
+
+						if ($result > 0)
+						{
+							$this->db->commit();
+							return 1;
+						}
+						else
+						{
+							$this->db->rollback();
+							$this->error=$this->db->lasterror();
+							return -1;
+						}
+					}
+					else
+					{
+						$this->db->rollback();
+						$this->error=$line->error;
+						return -1;
+					}
+				}
+				else
+				{
+					$this->db->rollback();
+					return 0;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error=$this->db->lasterror();
+				return -1;
+			}
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Applique une remise relative
+	 *
+	 * 	@param     	User		$user		User qui positionne la remise
+	 * 	@param     	float		$remise		Discount (percent)
+	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return		int 					<0 if KO, >0 if OK
+	 */
+	function set_remise($user, $remise, $notrigger=0)
+	{
+		$remise=trim($remise)?trim($remise):0;
+
+		if ($user->rights->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$remise=price2num($remise);
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+			$sql.= ' SET remise_percent = '.$remise;
+			$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->remise_percent = $remise;
+				$this->update_price(1);
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+
+	/**
+	 * 		Applique une remise absolue
+	 *
+	 * 		@param     	User		$user 		User qui positionne la remise
+	 * 		@param     	float		$remise		Discount
+	 * 		@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *		@return		int 					<0 if KO, >0 if OK
+	 */
+	function set_remise_absolue($user, $remise, $notrigger=0)
+	{
+		$remise=trim($remise)?trim($remise):0;
+
+		if ($user->rights->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$remise=price2num($remise);
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+			$sql.= ' SET remise_absolue = '.$remise;
+			$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->remise_absolue = $remise;
+				$this->update_price(1);
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+	}
+
+
+	/**
+	 *	Set the order date
+	 *
+	 *	@param      User	$user       Object user making change
+	 *	@param      int		$date		Date
+	 * 	@param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         		<0 if KO, >0 if OK
+	 */
+	function set_date($user, $date, $notrigger=0)
+	{
+		if ($user->rights->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+			$sql.= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
+			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->date = $date;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			return -2;
+		}
+	}
+
+	/**
+	 *	Set the planned delivery date
+	 *
+	 *	@param      User	$user        		Objet utilisateur qui modifie
+	 *	@param      int		$date_livraison     Date de livraison
+	 *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				<0 si ko, >0 si ok
+	 */
+	function set_date_livraison($user, $date_livraison, $notrigger=0)
+	{
+		if ($user->rights->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+			$sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->date_livraison = $date_livraison;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			return -2;
+		}
+	}
+
+	/**
+	 *  Return list of orders (eventuelly filtered on a 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      User	$excluser      	Objet user to exclude
+	 *  @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, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='c.date_commande', $sortorder='DESC')
+	{
+		global $user;
+
+		$ga = array();
+
+		$sql = "SELECT s.rowid, s.nom as name, s.client,";
+		$sql.= " c.rowid as cid, c.ref";
+		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."commande as c";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE c.entity IN (".getEntity('commande').")";
+		$sql.= " AND c.fk_soc = s.rowid";
+		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 c.fk_statut = ".self::STATUS_DRAFT;
+		if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
+		$sql.= $this->db->order($sortfield,$sortorder);
+		$sql.= $this->db->plimit($limit,$offset);
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			$numc = $this->db->num_rows($result);
+			if ($numc)
+			{
+				$i = 0;
+				while ($i < $numc)
+				{
+					$obj = $this->db->fetch_object($result);
+
+					if ($shortlist == 1)
+					{
+						$ga[$obj->cid] = $obj->ref;
+					}
+					else if ($shortlist == 2)
+					{
+						$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
+					}
+					else
+					{
+						$ga[$i]['id']	= $obj->cid;
+						$ga[$i]['ref'] 	= $obj->ref;
+						$ga[$i]['name'] = $obj->name;
+					}
+					$i++;
+				}
+			}
+			return $ga;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update delivery delay
+	 *
+	 *	@param      int		$availability_id	Id du nouveau mode
+	 *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				>0 if OK, <0 if KO
+	 */
+	function availability($availability_id, $notrigger=0)
+	{
+		global $user;
+
+		dol_syslog('Commande::availability('.$availability_id.')');
+		if ($this->statut >= self::STATUS_DRAFT)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+			$sql .= ' SET fk_availability = '.$availability_id;
+			$sql .= ' WHERE rowid='.$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->availability_id = $availability_id;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$error_str='Command status do not meet requirement '.$this->statut;
+			dol_syslog(__METHOD__.$error_str, LOG_ERR);
+			$this->error=$error_str;
+			$this->errors[]= $this->error;
+			return -2;
+		}
+	}
+
+	/**
+	 *	Update order demand_reason
+	 *
+	 *  @param      int		$demand_reason_id	Id of new demand
+	 *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *  @return     int        			 		>0 if ok, <0 if ko
+	 */
+	function demand_reason($demand_reason_id, $notrigger=0)
+	{
+		global $user;
+
+		dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
+		if ($this->statut >= self::STATUS_DRAFT)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+			$sql .= ' SET fk_input_reason = '.$demand_reason_id;
+			$sql .= ' WHERE rowid='.$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->demand_reason_id = $demand_reason_id;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$error_str='order status do not meet requirement '.$this->statut;
+			dol_syslog(__METHOD__.$error_str, LOG_ERR);
+			$this->error=$error_str;
+			$this->errors[]= $this->error;
+			return -2;
+		}
+	}
+
+	/**
+	 *	Set customer ref
+	 *
+	 *	@param      User	$user           User that make change
+	 *	@param      string	$ref_client     Customer ref
+	 *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return     int             		<0 if KO, >0 if OK
+	 */
+	function set_ref_client($user, $ref_client, $notrigger=0)
+	{
+		if ($user->rights->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
+			$sql.= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
+			$sql.= ' WHERE rowid = '.$this->id;
+
+			dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->ref_client = $ref_client;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 * Classify the order as invoiced
+	 *
+	 * @param	User    $user       Object user making the change
+	 * @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 * @return	int                 <0 if KO, >0 if OK
+	 */
+	function classifyBilled(User $user, $notrigger=0)
+	{
+		$error = 0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
+		$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+
+		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->facturee=1; // deprecated
+				$this->billed=1;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Classify the order as invoiced
+	 *
+	 * @return     int     <0 if ko, >0 if ok
+	 * @deprecated
+	 * @see classifyBilled()
+	 */
+	function classer_facturee()
+	{
+		global $user;
+		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+
+		return $this->classifyBilled($user);
+	}
 
 	/**
-	 * Classify the order as invoiced
+	 * Classify the order as not invoiced
 	 *
-	 * @param	User    $user       Object user making the change
-	 * @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 * @return	int                 <0 if KO, >0 if OK
+	 * @return     int     <0 if ko, >0 if ok
 	 */
-	function classifyBilled(User $user, $notrigger=0)
+	function classifyUnBilled()
 	{
-        $error = 0;
+		global $conf, $user, $langs;
+		$error = 0;
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 0';
 		$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
-		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
+		dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-
 			if (! $error)
 			{
 				$this->oldcopy= clone $this;
@@ -2648,16 +2720,16 @@ 
 				$this->billed=1;
 			}
 
-			if (! $notrigger && empty($error))
-			{
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-			}
+			// Call trigger
+			$result=$this->call_trigger('ORDER_CLASSIFY_UNBILLED',$user);
+			if ($result < 0) $error++;
+			// End call triggers
 
 			if (! $error)
 			{
+				$this->facturee=0; // deprecated
+				$this->billed=0;
+
 				$this->db->commit();
 				return 1;
 			}
@@ -2665,7 +2737,7 @@ 
 			{
 				foreach($this->errors as $errmsg)
 				{
-					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
+					dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
 					$this->error.=($this->error?', '.$errmsg:$errmsg);
 				}
 				$this->db->rollback();
@@ -2675,175 +2747,103 @@ 
 		else
 		{
 			$this->error=$this->db->error();
-            $this->db->rollback();
+			$this->db->rollback();
 			return -1;
 		}
 	}
 
+
 	/**
-	 * Classify the order as invoiced
+	 *  Update a line in database
 	 *
-	 * @return     int     <0 if ko, >0 if ok
-	 * @deprecated
-	 * @see classifyBilled()
+	 *  @param    	int				$rowid            	Id of line to update
+	 *  @param    	string			$desc             	Description of line
+	 *  @param    	float			$pu               	Unit price
+	 *  @param    	float			$qty              	Quantity
+	 *  @param    	float			$remise_percent   	Percent of discount
+	 *  @param    	float			$txtva           	Taux TVA
+	 * 	@param		float			$txlocaltax1		Local tax 1 rate
+	 *  @param		float			$txlocaltax2		Local tax 2 rate
+	 *  @param    	string			$price_base_type	HT or TTC
+	 *  @param    	int				$info_bits        	Miscellaneous informations on line
+	 *  @param    	int				$date_start        	Start date of the line
+	 *  @param    	int				$date_end          	End date of the line
+	 * 	@param		int				$type				Type of line (0=product, 1=service)
+	 * 	@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				Label
+	 *  @param		int				$special_code		Special code (also used by externals modules!)
+	 *  @param		array			$array_options		extrafields array
+	 * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
+	 *  @param		double			$pu_ht_devise		Amount in currency
+	 * 	@param		int				$notrigger			disable line update trigger
+	 *  @return   	int              					< 0 if KO, > 0 if OK
 	 */
-	function classer_facturee()
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0)
 	{
-	    global $user;
-		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+		global $conf, $mysoc, $langs, $user;
 
-		return $this->classifyBilled($user);
-	}
+		dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-	/**
-	 * Classify the order as not invoiced
-	 *
-	 * @return     int     <0 if ko, >0 if ok
-	 */
-	function classifyUnBilled()
-	{
-	    global $conf, $user, $langs;
-	    $error = 0;
-
-	    $this->db->begin();
-
-	    $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 0';
-	    $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
-
-	    dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
-	    if ($this->db->query($sql))
-	    {
-	    	if (! $error)
-	    	{
-	    		$this->oldcopy= clone $this;
-	    		$this->facturee=1; // deprecated
-	    		$this->billed=1;
-	    	}
-
-	        // Call trigger
-	        $result=$this->call_trigger('ORDER_CLASSIFY_UNBILLED',$user);
-	        if ($result < 0) $error++;
-	        // End call triggers
-
-	        if (! $error)
-	        {
-	            $this->facturee=0; // deprecated
-	            $this->billed=0;
-
-	            $this->db->commit();
-	            return 1;
-	        }
-	        else
-	        {
-	            foreach($this->errors as $errmsg)
-	            {
-	                dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
-	                $this->error.=($this->error?', '.$errmsg:$errmsg);
-	            }
-	            $this->db->rollback();
-	            return -1*$error;
-	        }
-	    }
-	    else
-	    {
-	        $this->error=$this->db->error();
-	        $this->db->rollback();
-	        return -1;
-	    }
-	}
+		if (! empty($this->brouillon))
+		{
+			$this->db->begin();
+
+			// Clean parameters
+			if (empty($qty)) $qty=0;
+			if (empty($info_bits)) $info_bits=0;
+			if (empty($txtva)) $txtva=0;
+			if (empty($txlocaltax1)) $txlocaltax1=0;
+			if (empty($txlocaltax2)) $txlocaltax2=0;
+			if (empty($remise)) $remise=0;
+			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($special_code) || $special_code == 3) $special_code=0;
+
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu = price2num($pu);
+	  		$pa_ht=price2num($pa_ht);
+			$txtva=price2num($txtva);
+			$txlocaltax1=price2num($txlocaltax1);
+			$txlocaltax2=price2num($txlocaltax2);
 
+			// 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.
 
-    /**
-     *  Update a line in database
-     *
-     *  @param    	int				$rowid            	Id of line to update
-     *  @param    	string			$desc             	Description of line
-     *  @param    	float			$pu               	Unit price
-     *  @param    	float			$qty              	Quantity
-     *  @param    	float			$remise_percent   	Percent of discount
-     *  @param    	float			$txtva           	Taux TVA
-     * 	@param		float			$txlocaltax1		Local tax 1 rate
-     *  @param		float			$txlocaltax2		Local tax 2 rate
-     *  @param    	string			$price_base_type	HT or TTC
-     *  @param    	int				$info_bits        	Miscellaneous informations on line
-     *  @param    	int				$date_start        	Start date of the line
-     *  @param    	int				$date_end          	End date of the line
-     * 	@param		int				$type				Type of line (0=product, 1=service)
-     * 	@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				Label
-     *  @param		int				$special_code		Special code (also used by externals modules!)
-	 *  @param		array			$array_options		extrafields array
-     * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
-	 *  @param		double			$pu_ht_devise		Amount in currency
-     * 	@param		int				$notrigger			disable line update trigger
-     *  @return   	int              					< 0 if KO, > 0 if OK
-     */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0)
-    {
-        global $conf, $mysoc, $langs, $user;
-
-        dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        if (! empty($this->brouillon))
-        {
-            $this->db->begin();
-
-            // Clean parameters
-            if (empty($qty)) $qty=0;
-            if (empty($info_bits)) $info_bits=0;
-            if (empty($txtva)) $txtva=0;
-            if (empty($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2)) $txlocaltax2=0;
-            if (empty($remise)) $remise=0;
-            if (empty($remise_percent)) $remise_percent=0;
-            if (empty($special_code) || $special_code == 3) $special_code=0;
-
-            $remise_percent=price2num($remise_percent);
-            $qty=price2num($qty);
-            $pu = price2num($pu);
-      		$pa_ht=price2num($pa_ht);
-            $txtva=price2num($txtva);
-            $txlocaltax1=price2num($txlocaltax1);
-            $txlocaltax2=price2num($txlocaltax2);
-
-            // 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);
-
-       		// Clean vat code
-    		$vat_src_code='';
-    		if (preg_match('/\((.*)\)/', $txtva, $reg))
-    		{
-    		    $vat_src_code = $reg[1];
-    		    $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, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
+
+	   		// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$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, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 			$pu_ht  = $tabprice[3];
 			$pu_tva = $tabprice[4];
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            // Anciens indicateurs: $price, $subprice, $remise (a ne plus utiliser)
-            $price = $pu_ht;
+			// Anciens indicateurs: $price, $subprice, $remise (a ne plus utiliser)
+			$price = $pu_ht;
 			if ($price_base_type == 'TTC')
 			{
 				$subprice = $pu_ttc;
@@ -2852,72 +2852,72 @@ 
 			{
 				$subprice = $pu_ht;
 			}
-            $remise = 0;
-            if ($remise_percent > 0)
-            {
-                $remise = round(($pu * $remise_percent / 100),2);
-                $price = ($pu - $remise);
-            }
-
-            //Fetch current line from the database and then clone the object and set it in $oldline property
-            $line = new OrderLine($this->db);
-            $line->fetch($rowid);
-
-            if (!empty($line->fk_product))
-            {
-                $product=new Product($this->db);
-                $result=$product->fetch($line->fk_product);
-                $product_type=$product->type;
-
-                if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
-                {
-                    $langs->load("errors");
-                    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
-                    dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
-                    $this->db->rollback();
-                    return self::STOCK_NOT_ENOUGH_FOR_ORDER;
-                }
-            }
-
-            $staticline = clone $line;
-
-            $line->oldline = $staticline;
-            $this->line = $line;
-            $this->line->context = $this->context;
-
-            // 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->vat_src_code	= $vat_src_code;
-            $this->line->tva_tx         = $txtva;
-            $this->line->localtax1_tx   = $txlocaltax1;
-            $this->line->localtax2_tx   = $txlocaltax2;
+			$remise = 0;
+			if ($remise_percent > 0)
+			{
+				$remise = round(($pu * $remise_percent / 100),2);
+				$price = ($pu - $remise);
+			}
+
+			//Fetch current line from the database and then clone the object and set it in $oldline property
+			$line = new OrderLine($this->db);
+			$line->fetch($rowid);
+
+			if (!empty($line->fk_product))
+			{
+				$product=new Product($this->db);
+				$result=$product->fetch($line->fk_product);
+				$product_type=$product->type;
+
+				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+				{
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
+					dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
+					$this->db->rollback();
+					return self::STOCK_NOT_ENOUGH_FOR_ORDER;
+				}
+			}
+
+			$staticline = clone $line;
+
+			$line->oldline = $staticline;
+			$this->line = $line;
+			$this->line->context = $this->context;
+
+			// 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->vat_src_code	= $vat_src_code;
+			$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       = $subprice;
-            $this->line->info_bits      = $info_bits;
-            $this->line->special_code   = $special_code;
-            $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->date_start     = $date_start;
-            $this->line->date_end       = $date_end;
-            $this->line->product_type   = $type;
-            $this->line->fk_parent_line = $fk_parent_line;
-            $this->line->skip_update_total=$skip_update_total;
-	        $this->line->fk_unit        = $fk_unit;
+			$this->line->remise_percent = $remise_percent;
+			$this->line->subprice       = $subprice;
+			$this->line->info_bits      = $info_bits;
+			$this->line->special_code   = $special_code;
+			$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->date_start     = $date_start;
+			$this->line->date_end       = $date_end;
+			$this->line->product_type   = $type;
+			$this->line->fk_parent_line = $fk_parent_line;
+			$this->line->skip_update_total=$skip_update_total;
+			$this->line->fk_unit        = $fk_unit;
 
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
@@ -2925,44 +2925,44 @@ 
 			// Multicurrency
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+			// TODO deprecated
+			$this->line->price=$price;
+			$this->line->remise=$remise;
 
 			if (is_array($array_options) && count($array_options)>0) {
 				$this->line->array_options=$array_options;
 			}
 
-            $result=$this->line->update($user, $notrigger);
-            if ($result > 0)
-            {
-            	// Reorder if child line
-            	if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-                // Mise a jour info denormalisees
-                $this->update_price(1);
-
-                $this->db->commit();
-                return $result;
-            }
-            else
-            {
-	            $this->error=$this->line->error;
-
-	            $this->db->rollback();
-	            return -1;
-            }
-        }
-        else
-        {
-            $this->error=get_class($this)."::updateline Order status makes operation forbidden";
-        	$this->errors=array('OrderStatusMakeOperationForbidden');
-            return -2;
-        }
-    }
+			$result=$this->line->update($user, $notrigger);
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+				// Mise a jour info denormalisees
+				$this->update_price(1);
+
+				$this->db->commit();
+				return $result;
+			}
+			else
+			{
+				$this->error=$this->line->error;
+
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=get_class($this)."::updateline Order status makes operation forbidden";
+			$this->errors=array('OrderStatusMakeOperationForbidden');
+			return -2;
+		}
+	}
 
 	/**
 	 *      Update database
@@ -3025,383 +3025,383 @@ 
 		{
 			if (! $notrigger)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('ORDER_MODIFY',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('ORDER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Update value of extrafields on order
+	 *
+	 *	@param      User	$user       Object user that modify
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	function update_extrafields($user)
+	{
+		global $hookmanager, $conf;
+
+		$action='create';
+		$error = 0;
+
+		// Actions on extra fields (by external module or standard code)
+		// TODO le hook fait double emploi avec le trigger !!
+		$hookmanager->initHooks(array('orderdao'));
+		$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;
+		}
+
+	}
+
+	/**
+	 *	Delete the customer order
+	 *
+	 *	@param	User	$user		User object
+	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 * 	@return	int					<=0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+
+		$this->db->begin();
+
+		if (! $error && ! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('ORDER_DELETE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		//TODO: Check for error after each action. If one failed we rollback, don't waste time to do action if previous fail
+		if (! $error)
+		{
+			// Delete order details
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
+			if (! $this->db->query($sql) )
+			{
+				$error++;
+				$this->errors[]=$this->db->lasterror();
+			}
+
+			// Delete order
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
+			if (! $this->db->query($sql) )
+			{
+				$error++;
+				$this->errors[]=$this->db->lasterror();
+			}
+
+			// Delete linked object
+			$res = $this->deleteObjectLinked();
+			if ($res < 0) $error++;
+
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0) $error++;
+
+			// Remove extrafields
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			{
+				$result=$this->deleteExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+				}
+			}
+
+			// On efface le repertoire de pdf provisoire
+			$comref = dol_sanitizeFileName($this->ref);
+			if ($conf->commande->dir_output && !empty($this->ref))
+			{
+				$dir = $conf->commande->dir_output . "/" . $comref ;
+				$file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
+				if (file_exists($file))	// We must delete all files before deleting directory
+				{
+					dol_delete_preview($this);
+
+					if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+					{
+						$this->db->rollback();
+						return 0;
+					}
+				}
+				if (file_exists($dir))
+				{
+					if (! dol_delete_dir_recursive($dir))
+					{
+						$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+						$this->db->rollback();
+						return 0;
+					}
+				}
+			}
+
+
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			foreach($this->errors as $errmsg)
+			{
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+	}
+
+
+	/**
+	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *	@param		User	$user   Object user
+	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	function load_board($user)
+	{
+		global $conf, $langs;
+
+		$clause = " WHERE";
+
+		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = " AND";
+		}
+		$sql.= $clause." c.entity IN (".getEntity('commande').")";
+		//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
+		$sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
+		if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$response = new WorkboardResponse();
+			$response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
+			$response->label=$langs->trans("OrdersToProcess");
+			$response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
+			$response->img=img_object('',"order");
+
+			$generic_commande = new Commande($this->db);
+
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+
+				$generic_commande->statut = $obj->fk_statut;
+				$generic_commande->date_commande = $this->db->jdate($obj->date_commande);
+				$generic_commande->date_livraison = $this->db->jdate($obj->delivery_date);
+
+				if ($generic_commande->hasDelay()) {
+					$response->nbtodolate++;
+				}
 			}
+
+			return $response;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Return source label of order
+	 *
+	 *	@return     string      Label
+	 */
+	function getLabelSource()
+	{
+		global $langs;
+
+		$label=$langs->trans('OrderSource'.$this->source);
+
+		if ($label == 'OrderSource') return '';
+		return $label;
+	}
+
+	/**
+	 *	Return status label of Order
+	 *
+	 *	@param      int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *	@return     string      		Libelle
+	 */
+	function getLibStatut($mode)
+	{
+		if ($this->facturee && empty($this->billed)) $this->billed=$this->facturee; // For backward compatibility
+		return $this->LibStatut($this->statut,$this->billed,$mode);
+	}
+
+	/**
+	 *	Return label of status
+	 *
+	 *	@param		int		$statut      	  Id statut
+	 *  @param      int		$billed    		  If invoiced
+	 *	@param      int		$mode        	  0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param      int     $donotshowbilled  Do not show billed status after order status
+	 *  @return     string					  Label of status
+	 */
+	function LibStatut($statut,$billed,$mode,$donotshowbilled=0)
+	{
+		global $langs, $conf;
+
+		$billedtext = '';
+		if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
+
+		//print 'x'.$statut.'-'.$billed;
+		if ($mode == 0)
+		{
+			if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
+			if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
+			if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
+			if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
+			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
+		}
+		elseif ($mode == 1)
+		{
+			if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
+			if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
+			if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
+			if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
+			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
+		}
+		elseif ($mode == 2)
+		{
+			if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
+			if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
+			if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
+			if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
+			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
+		}
+		elseif ($mode == 3)
+		{
+			if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+			if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+			if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+			if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
+			if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
+			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
 		}
-
-		// Commit or rollback
-		if ($error)
+		elseif ($mode == 4)
 		{
-			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;
+			if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
+			if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
+			if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
+			if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
+			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
 		}
-		else
+		elseif ($mode == 5)
 		{
-			$this->db->commit();
-			return 1;
+			if ($statut==self::STATUS_CANCELED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderCanceledShort').' </span>'.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+			if ($statut==self::STATUS_DRAFT) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'),'statut0');
+			if ($statut==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+			if ($statut==self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
+			if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut4');
+			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
 		}
 	}
 
-    /**
-     *	Update value of extrafields on order
-     *
-     *	@param      User	$user       Object user that modify
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function update_extrafields($user)
-    {
-        global $hookmanager, $conf;
-
-    	$action='create';
-        $error = 0;
-
-    	// Actions on extra fields (by external module or standard code)
-    	// TODO le hook fait double emploi avec le trigger !!
-    	$hookmanager->initHooks(array('orderdao'));
-    	$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;
-    	}
-
-    }
-
-    /**
-     *	Delete the customer order
-     *
-     *	@param	User	$user		User object
-     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     * 	@return	int					<=0 if KO, >0 if OK
-     */
-    function delete($user, $notrigger=0)
-    {
-        global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error = 0;
-
-        dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
-
-        $this->db->begin();
-
-        if (! $error && ! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('ORDER_DELETE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-
-        //TODO: Check for error after each action. If one failed we rollback, don't waste time to do action if previous fail
-        if (! $error)
-        {
-        	// Delete order details
-        	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
-        	if (! $this->db->query($sql) )
-        	{
-        		$error++;
-        		$this->errors[]=$this->db->lasterror();
-        	}
-
-        	// Delete order
-        	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
-        	if (! $this->db->query($sql) )
-        	{
-        		$error++;
-        		$this->errors[]=$this->db->lasterror();
-        	}
-
-        	// Delete linked object
-        	$res = $this->deleteObjectLinked();
-        	if ($res < 0) $error++;
-
-        	// Delete linked contacts
-        	$res = $this->delete_linked_contact();
-        	if ($res < 0) $error++;
-
-        	// Remove extrafields
-        	if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-        	{
-        		$result=$this->deleteExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        			dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        		}
-        	}
-
-        	// On efface le repertoire de pdf provisoire
-        	$comref = dol_sanitizeFileName($this->ref);
-        	if ($conf->commande->dir_output && !empty($this->ref))
-        	{
-        		$dir = $conf->commande->dir_output . "/" . $comref ;
-        		$file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
-        		if (file_exists($file))	// We must delete all files before deleting directory
-        		{
-        			dol_delete_preview($this);
-
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
-        			{
-        				$this->db->rollback();
-        				return 0;
-        			}
-        		}
-        		if (file_exists($dir))
-        		{
-        			if (! dol_delete_dir_recursive($dir))
-        			{
-        				$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
-        				$this->db->rollback();
-        				return 0;
-        			}
-        		}
-        	}
-
-
-        }
-
-        if (! $error)
-        {
-        	$this->db->commit();
-        	return 1;
-        }
-        else
-        {
-	        foreach($this->errors as $errmsg)
-	        {
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
-	        }
-	        $this->db->rollback();
-	        return -1*$error;
-        }
-    }
-
-
-    /**
-     *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *	@param		User	$user   Object user
-     *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-     */
-    function load_board($user)
-    {
-        global $conf, $langs;
-
-        $clause = " WHERE";
-
-        $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-        {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
-            $clause = " AND";
-        }
-        $sql.= $clause." c.entity IN (".getEntity('commande').")";
-        //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
-        $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
-	        $response->label=$langs->trans("OrdersToProcess");
-	        $response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
-	        $response->img=img_object('',"order");
-
-            $generic_commande = new Commande($this->db);
-
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                $generic_commande->statut = $obj->fk_statut;
-                $generic_commande->date_commande = $this->db->jdate($obj->date_commande);
-                $generic_commande->date_livraison = $this->db->jdate($obj->delivery_date);
-
-                if ($generic_commande->hasDelay()) {
-		            $response->nbtodolate++;
-	            }
-            }
-
-            return $response;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *	Return source label of order
-     *
-     *	@return     string      Label
-     */
-    function getLabelSource()
-    {
-        global $langs;
-
-        $label=$langs->trans('OrderSource'.$this->source);
-
-        if ($label == 'OrderSource') return '';
-        return $label;
-    }
-
-    /**
-     *	Return status label of Order
-     *
-     *	@param      int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *	@return     string      		Libelle
-     */
-    function getLibStatut($mode)
-    {
-        if ($this->facturee && empty($this->billed)) $this->billed=$this->facturee; // For backward compatibility
-        return $this->LibStatut($this->statut,$this->billed,$mode);
-    }
-
-    /**
-     *	Return label of status
-     *
-     *	@param		int		$statut      	  Id statut
-     *  @param      int		$billed    		  If invoiced
-     *	@param      int		$mode        	  0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @param      int     $donotshowbilled  Do not show billed status after order status
-     *  @return     string					  Label of status
-     */
-    function LibStatut($statut,$billed,$mode,$donotshowbilled=0)
-    {
-        global $langs, $conf;
-
-        $billedtext = '';
-        if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
-
-        //print 'x'.$statut.'-'.$billed;
-        if ($mode == 0)
-        {
-            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
-            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
-            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
-        }
-        elseif ($mode == 1)
-        {
-            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
-            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
-            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
-        }
-        elseif ($mode == 2)
-        {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
-        }
-        elseif ($mode == 3)
-        {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
-        }
-        elseif ($mode == 4)
-        {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
-        }
-        elseif ($mode == 5)
-        {
-            if ($statut==self::STATUS_CANCELED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderCanceledShort').' </span>'.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==self::STATUS_DRAFT) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
-            if ($statut==self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut4');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
-        }
-    }
-
-
-    /**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int			$withpicto                Add picto into link
-     *	@param      string	    $option                   Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-     *	@param      int			$max          	          Max length to show
-     *	@param      int			$short			          ???
-     *  @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='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
-    {
-        global $conf, $langs, $user;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-        $result='';
-
-        if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
-        else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
-
-        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';
-        }
-
-        if ($short) return $url;
-
-        $picto = 'order';
-        $label = '';
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int			$withpicto                Add picto into link
+	 *	@param      string	    $option                   Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *	@param      int			$max          	          Max length to show
+	 *	@param      int			$short			          ???
+	 *  @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='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
+	{
+		global $conf, $langs, $user;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+		$result='';
+
+		if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
+		else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
+
+		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';
+		}
+
+		if ($short) return $url;
+
+		$picto = 'order';
+		$label = '';
 
 		if ($user->rights->commande->lire) {
 			$label = '<u>'.$langs->trans("ShowOrder").'</u>';
@@ -3421,223 +3421,223 @@ 
 		$linkclose='';
 		if (empty($notooltip) && $user->rights->commande->lire)
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowOrder");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowOrder");
+				$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>';
+
+		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;
+	}
+
+
+	/**
+	 *	Charge les informations d'ordre info dans l'objet commande
+	 *
+	 *	@param  int		$id       Id of order
+	 *	@return	void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT c.rowid, date_creation as datec, tms as datem,';
+		$sql.= ' date_valid as datev,';
+		$sql.= ' date_cloture as datecloture,';
+		$sql.= ' fk_user_author, fk_user_valid, fk_user_cloture';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'commande 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;
+				if ($obj->fk_user_author)
+				{
+					$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->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_cloture      = $this->db->jdate($obj->datecloture);
+			}
+
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+
+	/**
+	 *  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 $langs;
+
+		dol_syslog(get_class($this)."::initAsSpecimen");
+
+		// 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];
+			}
 		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        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;
-    }
-
-
-    /**
-     *	Charge les informations d'ordre info dans l'objet commande
-     *
-     *	@param  int		$id       Id of order
-     *	@return	void
-     */
-    function info($id)
-    {
-        $sql = 'SELECT c.rowid, date_creation as datec, tms as datem,';
-        $sql.= ' date_valid as datev,';
-        $sql.= ' date_cloture as datecloture,';
-        $sql.= ' fk_user_author, fk_user_valid, fk_user_cloture';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande 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;
-                if ($obj->fk_user_author)
-                {
-                    $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->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-                $this->date_cloture      = $this->db->jdate($obj->datecloture);
-            }
-
-            $this->db->free($result);
-
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
-
-
-    /**
-     *  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 $langs;
-
-        dol_syslog(get_class($this)."::initAsSpecimen");
-
-        // 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->date_lim_reglement=$this->date+3600*24*30;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_code = 'CHQ';
-        $this->availability_code   = 'DSP';
-        $this->demand_reason_code  = 'SRC_00';
-        $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 OrderLine($this->db);
-
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=20;
-            if ($xnbp == 2)
-            {
-                $line->total_ht=50;
-                $line->total_ttc=60;
-                $line->total_tva=10;
-                $line->remise_percent=50;
-            }
-            else
-            {
-                $line->total_ht=100;
-                $line->total_ttc=120;
-                $line->total_tva=20;
-                $line->remise_percent=0;
-            }
-            if ($num_prods > 0)
-            {
-            	$prodid = mt_rand(1, $num_prods);
-            	$line->fk_product=$prodids[$prodid];
+		// Initialise parametres
+		$this->id=0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen=1;
+		$this->socid = 1;
+		$this->date = time();
+		$this->date_lim_reglement=$this->date+3600*24*30;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_code = 'CHQ';
+		$this->availability_code   = 'DSP';
+		$this->demand_reason_code  = 'SRC_00';
+		$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 OrderLine($this->db);
+
+			$line->desc=$langs->trans("Description")." ".$xnbp;
+			$line->qty=1;
+			$line->subprice=100;
+			$line->price=100;
+			$line->tva_tx=20;
+			if ($xnbp == 2)
+			{
+				$line->total_ht=50;
+				$line->total_ttc=60;
+				$line->total_tva=10;
+				$line->remise_percent=50;
+			}
+			else
+			{
+				$line->total_ht=100;
+				$line->total_ttc=120;
+				$line->total_tva=20;
+				$line->remise_percent=0;
+			}
+			if ($num_prods > 0)
+			{
+				$prodid = mt_rand(1, $num_prods);
+				$line->fk_product=$prodids[$prodid];
 				$line->product_ref='SPECIMEN';
-            }
-
-            $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 si ko, >0 si ok
-     */
-    function load_state_board()
-    {
-        global $user;
-
-        $this->nb=array();
-        $clause = "WHERE";
-
-        $sql = "SELECT count(co.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.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." co.entity IN (".getEntity('commande').")";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $this->nb["orders"]=$obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
+			}
+
+			$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 si ko, >0 si ok
+	 */
+	function load_state_board()
+	{
+		global $user;
+
+		$this->nb=array();
+		$clause = "WHERE";
+
+		$sql = "SELECT count(co.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.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." co.entity IN (".getEntity('commande').")";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["orders"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
 	 * 	Create an array of order lines
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
-     */
-    function getLinesArray()
-    {
-        return $this->fetch_lines();
-    }
+	 */
+	function getLinesArray()
+	{
+		return $this->fetch_lines();
+	}
 
 	/**
 	 *  Create a document onto disk according to template module.
@@ -3689,39 +3689,39 @@ 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
-    /**
-     * Is the customer order delayed?
-     *
-     * @return bool     true if late, false if not
-     */
-    public function hasDelay()
-    {
-        global $conf;
-
-        if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
-            return false;   // Never late if not inside this status range
-        }
-
-        $now = dol_now();
-
-        return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
-    }
-
-    /**
-     * Show the customer delayed info
-     *
-     * @return string       Show delayed information
-     */
-    public function showDelay()
-    {
-        global $conf, $langs;
-
-        if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
-        $text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
-
-        return $text;
-    }
+	/**
+	 * Is the customer order delayed?
+	 *
+	 * @return bool     true if late, false if not
+	 */
+	public function hasDelay()
+	{
+		global $conf;
+
+		if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
+			return false;   // Never late if not inside this status range
+		}
+
+		$now = dol_now();
+
+		return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
+	}
+
+	/**
+	 * Show the customer delayed info
+	 *
+	 * @return string       Show delayed information
+	 */
+	public function showDelay()
+	{
+		global $conf, $langs;
+
+		if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+		$text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+
+		return $text;
+	}
 }
 
 
@@ -3733,7 +3733,7 @@ 
 	public $element='commandedet';
 	public $table_element='commandedet';
 
-    var $oldline;
+	var $oldline;
 
 	/**
 	 * Id of parent order
@@ -3749,12 +3749,12 @@ 
 	 */
 	public $commande_id;
 
-    // From llx_commandedet
-    var $fk_parent_line;
-    var $fk_facture;
-    var $label;
-    var $fk_remise_except;
-    var $rang = 0;
+	// From llx_commandedet
+	var $fk_parent_line;
+	var $fk_facture;
+	var $label;
+	var $fk_remise_except;
+	var $rang = 0;
 	var $fk_fournprice;
 
 	/**
@@ -3762,8 +3762,8 @@ 
 	 * @var float
 	 */
 	var $pa_ht;
-    var $marge_tx;
-    var $marque_tx;
+	var $marge_tx;
+	var $marque_tx;
 
 	/**
 	 * @deprecated
@@ -3771,88 +3771,88 @@ 
 	 */
 	var $remise;
 
-    // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-    // Start and end date of the line
-    var $date_start;
-    var $date_end;
-
-    var $skip_update_total; // Skip update price total for special lines
-
-
-    /**
-     *      Constructor
-     *
-     *      @param     DoliDB	$db      handler d'acces base de donnee
-     */
-    function __construct($db)
-    {
-        $this->db= $db;
-    }
-
-    /**
-     *  Load line order
-     *
-     *  @param  int		$rowid          Id line order
-     *  @return	int						<0 if KO, >0 if OK
-     */
-    function fetch($rowid)
-    {
-        $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
-        $sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
-        $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
-	    $sql.= ' cd.fk_unit,';
+	// Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	// Start and end date of the line
+	var $date_start;
+	var $date_end;
+
+	var $skip_update_total; // Skip update price total for special lines
+
+
+	/**
+	 *      Constructor
+	 *
+	 *      @param     DoliDB	$db      handler d'acces base de donnee
+	 */
+	function __construct($db)
+	{
+		$this->db= $db;
+	}
+
+	/**
+	 *  Load line order
+	 *
+	 *  @param  int		$rowid          Id line order
+	 *  @return	int						<0 if KO, >0 if OK
+	 */
+	function fetch($rowid)
+	{
+		$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
+		$sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
+		$sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
+		$sql.= ' cd.fk_unit,';
 		$sql.= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
-        $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
-        $sql.= ' cd.date_start, cd.date_end';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
-        $sql.= ' WHERE cd.rowid = '.$rowid;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $objp = $this->db->fetch_object($result);
-            $this->rowid            = $objp->rowid;
-            $this->fk_commande      = $objp->fk_commande;
-            $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;
-            $this->subprice         = $objp->subprice;
-            $this->vat_src_code     = $objp->vat_src_code;
-            $this->tva_tx           = $objp->tva_tx;
-            $this->localtax1_tx		= $objp->localtax1_tx;
-            $this->localtax2_tx		= $objp->localtax2_tx;
-            $this->remise           = $objp->remise;
-            $this->remise_percent   = $objp->remise_percent;
-            $this->fk_remise_except = $objp->fk_remise_except;
-            $this->fk_product       = $objp->fk_product;
-            $this->product_type     = $objp->product_type;
-            $this->info_bits        = $objp->info_bits;
+		$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
+		$sql.= ' cd.date_start, cd.date_end';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+		$sql.= ' WHERE cd.rowid = '.$rowid;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
+			$this->rowid            = $objp->rowid;
+			$this->fk_commande      = $objp->fk_commande;
+			$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;
+			$this->subprice         = $objp->subprice;
+			$this->vat_src_code     = $objp->vat_src_code;
+			$this->tva_tx           = $objp->tva_tx;
+			$this->localtax1_tx		= $objp->localtax1_tx;
+			$this->localtax2_tx		= $objp->localtax2_tx;
+			$this->remise           = $objp->remise;
+			$this->remise_percent   = $objp->remise_percent;
+			$this->fk_remise_except = $objp->fk_remise_except;
+			$this->fk_product       = $objp->fk_product;
+			$this->product_type     = $objp->product_type;
+			$this->info_bits        = $objp->info_bits;
 			$this->special_code		= $objp->special_code;
-            $this->total_ht         = $objp->total_ht;
-            $this->total_tva        = $objp->total_tva;
-            $this->total_localtax1  = $objp->total_localtax1;
-            $this->total_localtax2  = $objp->total_localtax2;
-            $this->total_ttc        = $objp->total_ttc;
+			$this->total_ht         = $objp->total_ht;
+			$this->total_tva        = $objp->total_tva;
+			$this->total_localtax1  = $objp->total_localtax1;
+			$this->total_localtax2  = $objp->total_localtax2;
+			$this->total_ttc        = $objp->total_ttc;
 			$this->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];
 			$this->marge_tx			= $marginInfos[1];
 			$this->marque_tx		= $marginInfos[2];
-            $this->special_code		= $objp->special_code;
-            $this->rang             = $objp->rang;
+			$this->special_code		= $objp->special_code;
+			$this->rang             = $objp->rang;
 
-            $this->ref				= $objp->product_ref;      // deprecated
-            $this->product_ref		= $objp->product_ref;
-            $this->libelle			= $objp->product_libelle;  // deprecated
-            $this->product_label	= $objp->product_libelle;
-            $this->product_desc     = $objp->product_desc;
-            $this->product_tobatch  = $objp->product_tobatch;
-            $this->fk_unit          = $objp->fk_unit;
+			$this->ref				= $objp->product_ref;      // deprecated
+			$this->product_ref		= $objp->product_ref;
+			$this->libelle			= $objp->product_libelle;  // deprecated
+			$this->product_label	= $objp->product_libelle;
+			$this->product_desc     = $objp->product_desc;
+			$this->product_tobatch  = $objp->product_tobatch;
+			$this->fk_unit          = $objp->fk_unit;
 
-            $this->date_start       = $this->db->jdate($objp->date_start);
-            $this->date_end         = $this->db->jdate($objp->date_end);
+			$this->date_start       = $this->db->jdate($objp->date_start);
+			$this->date_end         = $this->db->jdate($objp->date_end);
 
 			$this->fk_multicurrency			= $objp->fk_multicurrency;
 			$this->multicurrency_code		= $objp->multicurrency_code;
@@ -3861,38 +3861,38 @@ 
 			$this->multicurrency_total_tva	= $objp->multicurrency_total_tva;
 			$this->multicurrency_total_ttc	= $objp->multicurrency_total_ttc;
 
-            $this->db->free($result);
-
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     * 	Delete line in database
-     *
-     *	@param      User	$user        	User that modify
+			$this->db->free($result);
+
+			return 1;
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Delete line in database
+	 *
+	 *	@param      User	$user        	User that modify
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *	@return	 int  <0 si ko, >0 si ok
-     */
-    function delete($user=null, $notrigger=0)
-    {
-        global $conf, $user, $langs;
+	 *	@return	 int  <0 si ko, >0 si ok
+	 */
+	function delete($user=null, $notrigger=0)
+	{
+		global $conf, $user, $langs;
 
 		$error=0;
 
-	    $this->db->begin();
+		$this->db->begin();
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
 
-        dol_syslog("OrderLine::delete", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
+		dol_syslog("OrderLine::delete", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
 			// Remove extrafields
 			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
 			{
@@ -3907,63 +3907,63 @@ 
 
 			if (! $error && ! $notrigger)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('LINEORDER_DELETE',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_DELETE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			}
+
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
 
-	        if (!$error) {
-		        $this->db->commit();
-		        return 1;
-	        }
-
-	        foreach($this->errors as $errmsg)
-	        {
-		        dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
-	        }
-	        $this->db->rollback();
-	        return -1*$error;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	Insert line into database
-     *
-     *	@param      User	$user        	User that modify
-     *	@param      int		$notrigger		1 = disable triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    function insert($user=null, $notrigger=0)
-    {
-        global $langs, $conf;
+	/**
+	 *	Insert line into database
+	 *
+	 *	@param      User	$user        	User that modify
+	 *	@param      int		$notrigger		1 = disable triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	function insert($user=null, $notrigger=0)
+	{
+		global $langs, $conf;
 
 		$error=0;
 
-        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang);
+		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;
+		// 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->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->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
@@ -3979,65 +3979,65 @@ 
 			}
 		}
 
-        // Check parameters
-        if ($this->product_type < 0) return -1;
+		// Check parameters
+		if ($this->product_type < 0) return -1;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Insertion dans base de la ligne
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
-        $sql.= ' (fk_commande, fk_parent_line, label, description, qty, ';
-        $sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
-        $sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
-        $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
-	    $sql.= ' fk_unit';
+		// Insertion dans base de la ligne
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
+		$sql.= ' (fk_commande, fk_parent_line, label, description, qty, ';
+		$sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+		$sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
+		$sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
+		$sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
+		$sql.= ' fk_unit';
 		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql.= ')';
-        $sql.= " VALUES (".$this->fk_commande.",";
-        $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.= " '".price2num($this->qty)."',";
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql.= " '".price2num($this->tva_tx)."',";
-        $sql.= " '".price2num($this->localtax1_tx)."',";
-        $sql.= " '".price2num($this->localtax2_tx)."',";
+		$sql.= " VALUES (".$this->fk_commande.",";
+		$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.= " '".price2num($this->qty)."',";
+		$sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+		$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->fk_product)?$this->fk_product:"null").',';
-        $sql.= " '".$this->db->escape($this->product_type)."',";
-        $sql.= " '".price2num($this->remise_percent)."',";
-        $sql.= " ".($this->subprice!=''?"'".price2num($this->subprice)."'":"null").",";
-        $sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").",";
-        $sql.= " '".price2num($this->remise)."',";
-        $sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
-        $sql.= ' '.$this->special_code.',';
-        $sql.= ' '.$this->rang.',';
+		$sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").',';
+		$sql.= " '".$this->db->escape($this->product_type)."',";
+		$sql.= " '".price2num($this->remise_percent)."',";
+		$sql.= " ".($this->subprice!=''?"'".price2num($this->subprice)."'":"null").",";
+		$sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").",";
+		$sql.= " '".price2num($this->remise)."',";
+		$sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
+		$sql.= ' '.$this->special_code.',';
+		$sql.= ' '.$this->rang.',';
 		$sql.= ' '.(! empty($this->fk_fournprice)?$this->fk_fournprice:"null").',';
 		$sql.= ' '.price2num($this->pa_ht).',';
-        $sql.= " '".$this->db->escape($this->info_bits)."',";
-        $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->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
-        $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
-	    $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql.= " '".$this->db->escape($this->info_bits)."',";
+		$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->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
+		$sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
+		$sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 		$sql.= ", ".$this->fk_multicurrency;
 		$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.= ')';
+		$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.'commandedet');
+		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.'commandedet');
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
@@ -4049,42 +4049,42 @@ 
 				}
 			}
 
-            if (! $error && ! $notrigger)
-            {
-	            // Call trigger
-	            $result=$this->call_trigger('LINEORDER_INSERT',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
-            }
-
-	        if (!$error) {
-		        $this->db->commit();
-		        return 1;
-	        }
-
-	        foreach($this->errors as $errmsg)
-	        {
-		        dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
-	        }
-	        $this->db->rollback();
-	        return -1*$error;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     *	Update the line object into db
-     *
-     *	@param      User	$user        	User that modify
+			if (! $error && ! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_INSERT',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			}
+
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 *	Update the line object into db
+	 *
+	 *	@param      User	$user        	User that modify
 	 *	@param      int		$notrigger		1 = disable triggers
-     *	@return		int		<0 si ko, >0 si ok
-     */
+	 *	@return		int		<0 si ko, >0 si ok
+	 */
 	function update($user=null, $notrigger=0)
 	{
 		global $conf,$langs;
@@ -4107,7 +4107,7 @@ 
 		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->special_code)) $this->special_code=0;
 		if (empty($this->product_type)) $this->product_type=0;
 		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
 		if (empty($this->pa_ht)) $this->pa_ht=0;
@@ -4153,7 +4153,7 @@ 
 		$sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?$this->fk_fournprice:"null");
 		$sql.= " , buy_price_ht='".price2num($this->pa_ht)."'";
 		$sql.= " , info_bits=".$this->info_bits;
-        $sql.= " , special_code=".$this->special_code;
+		$sql.= " , special_code=".$this->special_code;
 		$sql.= " , date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
 		$sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
 		$sql.= " , product_type=".$this->product_type;
@@ -4163,9 +4163,9 @@ 
 
 		// 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;
 
@@ -4185,10 +4185,10 @@ 
 
 			if (! $notrigger)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('LINEORDER_UPDATE',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_UPDATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 
 			if (!$error) {
@@ -4212,42 +4212,42 @@ 
 		}
 	}
 
-    /**
-     *	Update totals of order into database
-     *
-     *	@return		int		<0 if ko, >0 if ok
-     */
-    function update_total()
-    {
-        $this->db->begin();
-
-        // Clean parameters
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
-        $sql.= " total_ht='".price2num($this->total_ht)."'";
-        $sql.= ",total_tva='".price2num($this->total_tva)."'";
-        $sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= " WHERE rowid = ".$this->rowid;
-
-        dol_syslog("OrderLine::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;
-        }
-    }
+	/**
+	 *	Update totals of order into database
+	 *
+	 *	@return		int		<0 if ko, >0 if ok
+	 */
+	function update_total()
+	{
+		$this->db->begin();
+
+		// Clean parameters
+		if (empty($this->total_localtax1)) $this->total_localtax1=0;
+		if (empty($this->total_localtax2)) $this->total_localtax2=0;
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
+		$sql.= " total_ht='".price2num($this->total_ht)."'";
+		$sql.= ",total_tva='".price2num($this->total_tva)."'";
+		$sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
+		$sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
+		$sql.= ",total_ttc='".price2num($this->total_ttc)."'";
+		$sql.= " WHERE rowid = ".$this->rowid;
+
+		dol_syslog("OrderLine::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 +1035 added lines, -1035 removed lines

@@ -30,23 +30,23 @@ 
  *  \ingroup    commande
  *  \brief      Fichier des classes de commandes
  */
-include_once DOL_DOCUMENT_ROOT .'/core/class/commonorder.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.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 customers orders
  */
 class Commande extends CommonOrder
 {
-    public $element='commande';
-    public $table_element='commande';
+    public $element = 'commande';
+    public $table_element = 'commande';
     public $table_element_line = 'commandedet';
     public $class_element_line = 'OrderLine';
     public $fk_element = 'fk_commande';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'order';
 
     /**
@@ -74,7 +74,7 @@ 
 	 * @see billed
 	 */
     public $facturee;
-    public $billed;		// billed or not
+    public $billed; // billed or not
 
     public $brouillon;
     public $cond_reglement_code;
@@ -113,25 +113,25 @@ 
      */
     public $availability;
 
-    public $demand_reason_id;   // Source reason. Why we receive order (after a phone campaign, ...)
+    public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
     public $demand_reason_code;
-    public $date;				// Date commande
+    public $date; // Date commande
 	/**
 	 * @deprecated
 	 * @see date
 	 */
     public $date_commande;
-    public $date_livraison;	    // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+    public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
     public $fk_remise_except;
     public $remise_percent;
     public $remise_absolue;
     public $info_bits;
     public $rang;
     public $special_code;
-    public $source;			    // Order mode. How we received order (by phone, by email, ...)
-    public $extraparams=array();
+    public $source; // Order mode. How we received order (by phone, by email, ...)
+    public $extraparams = array();
 
-    public $linked_objects=array();
+    public $linked_objects = array();
 
     public $user_author_id;
     public $user_valid;
@@ -209,31 +209,31 @@ 
         global $langs, $conf;
         $langs->load("order");
 
-        if (! empty($conf->global->COMMANDE_ADDON))
+        if (!empty($conf->global->COMMANDE_ADDON))
         {
-        	$mybool=false;
+        	$mybool = false;
 
         	$file = $conf->global->COMMANDE_ADDON.".php";
 			$classname = $conf->global->COMMANDE_ADDON;
 
 			// Include file with class
-			$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 			foreach ($dirmodels as $reldir)
 			{
                 $dir = dol_buildpath($reldir."core/modules/commande/");
 
                 // 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 = $obj->getNextValue($soc,$this);
+            $numref = $obj->getNextValue($soc, $this);
 
             if ($numref != "")
             {
@@ -241,7 +241,7 @@ 
             }
             else
 			{
-				$this->error=$obj->error;
+				$this->error = $obj->error;
             	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
             	return "";
             }
@@ -262,12 +262,12 @@ 
      *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
      */
-    function valid($user, $idwarehouse=0, $notrigger=0)
+    function valid($user, $idwarehouse = 0, $notrigger = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+        $error = 0;
 
         // Protection
         if ($this->statut == self::STATUS_VALIDATED)
@@ -276,15 +276,15 @@ 
             return 0;
         }
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
+        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate))))
         {
-            $this->error='NotEnoughPermissions';
+            $this->error = 'NotEnoughPermissions';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
         }
 
-        $now=dol_now();
+        $now = dol_now();
 
         $this->db->begin();
 
@@ -293,10 +293,10 @@ 
         $soc->fetch($this->socid);
 
         // Class of company linked to order
-        $result=$soc->set_as_client();
+        $result = $soc->set_as_client();
 
         // 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);
         }
@@ -308,31 +308,31 @@ 
 
         // Validate
         $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-        $sql.= " SET ref = '".$num."',";
-        $sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
-        $sql.= " date_valid='".$this->db->idate($now)."',";
-        $sql.= " fk_user_valid = ".$user->id;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET ref = '".$num."',";
+        $sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
+        $sql .= " date_valid='".$this->db->idate($now)."',";
+        $sql .= " fk_user_valid = ".$user->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         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);
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             // If stock is incremented on validate order, we must increment it
-            if ($result >= 0 && ! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+            if ($result >= 0 && !empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
             {
                 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                 $langs->load("agenda");
 
                 // Loop on each line
-                $cpt=count($this->lines);
+                $cpt = count($this->lines);
                 for ($i = 0; $i < $cpt; $i++)
                 {
                     if ($this->lines[$i]->fk_product > 0)
@@ -340,11 +340,11 @@ 
                         $mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
                         // We decrement stock of product (and sub-products)
-                        $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num));
+                        $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr", $num));
                         if ($result < 0)
                         {
                         	$error++;
-                        	$this->error=$mouvP->error;
+                        	$this->error = $mouvP->error;
                         }
                     }
                     if ($error) break;
@@ -352,15 +352,15 @@ 
             }
         }
 
-        if (! $error && ! $notrigger)
+        if (!$error && !$notrigger)
         {
             // Call trigger
-            $result=$this->call_trigger('ORDER_VALIDATE',$user);
+            $result = $this->call_trigger('ORDER_VALIDATE', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->oldref = $this->ref;
 
@@ -381,13 +381,13 @@ 
                     {
                         dol_syslog("Rename ok");
                         // Rename docs starting with $oldref with $newref
-                        $listoffiles=dol_dir_list($conf->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-                        foreach($listoffiles as $fileentry)
+                        $listoffiles = dol_dir_list($conf->commande->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);
                         }
                     }
@@ -396,13 +396,13 @@ 
         }
 
         // Set new ref and current status
-        if (! $error)
+        if (!$error)
         {
             $this->ref = $num;
             $this->statut = self::STATUS_VALIDATED;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return 1;
@@ -421,11 +421,11 @@ 
      *	@param	int		$idwarehouse	Id warehouse to use for stock change.
      *	@return	int						<0 if KO, >0 if OK
      */
-    function set_draft($user, $idwarehouse=-1)
+    function set_draft($user, $idwarehouse = -1)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $error=0;
+        $error = 0;
 
         // Protection
         if ($this->statut <= self::STATUS_DRAFT)
@@ -433,31 +433,31 @@ 
             return 0;
         }
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
+        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate))))
         {
-            $this->error='Permission denied';
+            $this->error = 'Permission denied';
             return -1;
         }
 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-        $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             // If stock is decremented on validate order, we must reincrement it
-            if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+            if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
             {
                 $result = 0;
 
                 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                 $langs->load("agenda");
 
-                $num=count($this->lines);
+                $num = count($this->lines);
                 for ($i = 0; $i < $num; $i++)
                 {
                     if ($this->lines[$i]->fk_product > 0)
@@ -465,30 +465,30 @@ 
                         $mouvP = new MouvementStock($this->db);
                         $mouvP->origin = &$this;
                         // We increment stock of product (and sub-products)
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
-                        if ($result < 0) { $error++; $this->error=$mouvP->error; break; }
+                        $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr", $this->ref));
+                        if ($result < 0) { $error++; $this->error = $mouvP->error; break; }
                     }
                 }
             }
 
             if (!$error) {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_UNVALIDATE',$user);
+            	$result = $this->call_trigger('ORDER_UNVALIDATE', $user);
             	if ($result < 0) $error++;
             }
 
             if (!$error) {
-           		$this->statut=self::STATUS_DRAFT;
+           		$this->statut = self::STATUS_DRAFT;
             	$this->db->commit();
             	return 1;
-            }else {
+            } else {
             	$this->db->rollback();
             	return -1;
             }
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -504,7 +504,7 @@ 
      */
     function set_reopen($user)
     {
-        $error=0;
+        $error = 0;
 
         if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
         {
@@ -515,26 +515,26 @@ 
         $this->db->begin();
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-        $sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
-        $sql.= ' WHERE rowid = '.$this->id;
+        $sql .= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
+        $sql .= ' WHERE rowid = '.$this->id;
 
         dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             // Call trigger
-            $result=$this->call_trigger('ORDER_REOPEN',$user);
+            $result = $this->call_trigger('ORDER_REOPEN', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
         else
         {
             $error++;
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             dol_print_error($this->db);
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$this->statut = self::STATUS_VALIDATED;
         	$this->billed = 0;
@@ -545,13 +545,13 @@ 
         }
         else
         {
-	        foreach($this->errors as $errmsg)
+	        foreach ($this->errors as $errmsg)
 	        {
 		        dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
+		        $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 	        }
 	        $this->db->rollback();
-	        return -1*$error;
+	        return -1 * $error;
         }
     }
 
@@ -565,31 +565,31 @@ 
     {
         global $conf;
 
-        $error=0;
+        $error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
+        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate)))
         {
             $this->db->begin();
 
-            $now=dol_now();
+            $now = dol_now();
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET fk_statut = '.self::STATUS_CLOSED.',';
-            $sql.= ' fk_user_cloture = '.$user->id.',';
-            $sql.= " date_cloture = '".$this->db->idate($now)."'";
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+            $sql .= ' SET fk_statut = '.self::STATUS_CLOSED.',';
+            $sql .= ' fk_user_cloture = '.$user->id.',';
+            $sql .= " date_cloture = '".$this->db->idate($now)."'";
+            $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
             if ($this->db->query($sql))
             {
 	            // Call trigger
-	            $result=$this->call_trigger('ORDER_CLOSE',$user);
+	            $result = $this->call_trigger('ORDER_CLOSE', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 
-                if (! $error)
+                if (!$error)
                 {
-                	$this->statut=self::STATUS_CLOSED;
+                	$this->statut = self::STATUS_CLOSED;
 
                     $this->db->commit();
                     return 1;
@@ -602,7 +602,7 @@ 
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
 
                 $this->db->rollback();
                 return -1;
@@ -617,74 +617,74 @@ 
      *	@param	int		$idwarehouse	Id warehouse to use for stock change.
      *	@return	int						<0 if KO, >0 if OK
      */
-	function cancel($idwarehouse=-1)
+	function cancel($idwarehouse = -1)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql.= " SET fk_statut = ".self::STATUS_CANCELED;
-		$sql.= " WHERE rowid = ".$this->id;
-		$sql.= " AND fk_statut = ".self::STATUS_VALIDATED;
+		$sql .= " SET fk_statut = ".self::STATUS_CANCELED;
+		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
 		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			// If stock is decremented on validate order, we must reincrement it
-			if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+			if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
 					if ($this->lines[$i]->fk_product > 0)
 					{
 						$mouvP = new MouvementStock($this->db);
 						// We increment stock of product (and sub-products)
-						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr",$this->ref));  // price is 0, we don't want WAP to be changed
+						$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr", $this->ref)); // price is 0, we don't want WAP to be changed
 						if ($result < 0)
 						{
 							$error++;
-							$this->error=$mouvP->error;
+							$this->error = $mouvP->error;
 							break;
 						}
 					}
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('ORDER_CANCEL',$user);
+	            $result = $this->call_trigger('ORDER_CANCEL', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
-				$this->statut=self::STATUS_CANCELED;
+				$this->statut = self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
 			}
 			else
 			{
-				foreach($this->errors as $errmsg)
+				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::cancel ".$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
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -698,19 +698,19 @@ 
      *	@param		int	    $notrigger	Disable all triggers
      *	@return 	int			        <0 if KO, >0 if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
-        global $conf,$langs;
-        $error=0;
+        global $conf, $langs;
+        $error = 0;
 
         // Clean parameters
-        $this->brouillon = 1;		// set command as draft
+        $this->brouillon = 1; // set command as draft
 
 		// $date_commande is deprecated
         $date = ($this->date_commande ? $this->date_commande : $this->date);
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
@@ -722,99 +722,99 @@ 
         dol_syslog(get_class($this)."::create user=".$user->id);
 
         // 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;
     		}
     	}
 
         $soc = new Societe($this->db);
-        $result=$soc->fetch($this->socid);
+        $result = $soc->fetch($this->socid);
         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 -2;
         }
-        if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
+        if (!empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
         {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
+            $this->error = $langs->trans("ErrorFieldRequired", $langs->trans("Source"));
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
 
-        $now=dol_now();
+        $now = dol_now();
 
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
-        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
-        $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_warehouse";
-        $sql.= ", remise_absolue, remise_percent";
-        $sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", entity";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ")";
-        $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
-        $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
-        $sql.= ", '".$this->db->idate($date)."'";
-        $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->db->escape($this->source):'null');
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
-        $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
-        $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-        $sql.= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql.= ", ".($this->cond_reglement_id>0?$this->cond_reglement_id:"null");
-        $sql.= ", ".($this->mode_reglement_id>0?$this->mode_reglement_id:"null");
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".($this->availability_id>0?$this->availability_id:"null");
-        $sql.= ", ".($this->demand_reason_id>0?$this->demand_reason_id:"null");
-        $sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:'NULL');
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".($this->warehouse_id>0?$this->warehouse_id:'NULL');
-        $sql.= ", ".($this->remise_absolue>0?$this->db->escape($this->remise_absolue):'NULL');
-        $sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-        $sql.= ", ".$conf->entity;
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+        $sql .= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
+        $sql .= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
+        $sql .= ", fk_shipping_method";
+        $sql .= ", fk_warehouse";
+        $sql .= ", remise_absolue, remise_percent";
+        $sql .= ", fk_incoterms, location_incoterms";
+        $sql .= ", entity";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+        $sql .= ")";
+        $sql .= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
+        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+        $sql .= ", '".$this->db->idate($date)."'";
+        $sql .= ", ".($this->source >= 0 && $this->source != '' ? $this->db->escape($this->source) : 'null');
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+        $sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
+        $sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+        $sql .= ", '".$this->db->escape($this->modelpdf)."'";
+        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : "null");
+        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "null");
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", ".($this->availability_id > 0 ? $this->availability_id : "null");
+        $sql .= ", ".($this->demand_reason_id > 0 ? $this->demand_reason_id : "null");
+        $sql .= ", ".($this->date_livraison ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+        $sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : 'NULL');
+        $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+        $sql .= ", ".($this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
+        $sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');
+        $sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+        $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.'commande');
 
             if ($this->id)
             {
-                $fk_parent_line=0;
-                $num=count($this->lines);
+                $fk_parent_line = 0;
+                $num = count($this->lines);
 
                 /*
                  *  Insert products details into db
                  */
-                for ($i=0;$i<$num;$i++)
+                for ($i = 0; $i < $num; $i++)
                 {
                 	$line = $this->lines[$i];
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+                	if (!is_object($line)) $line = (object) $line;
 
                     // Reset fk_parent_line for no child products and special product
                     if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
@@ -852,7 +852,7 @@ 
                     {
                     	if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
                     	{
-                        	$this->error=$this->db->lasterror();
+                        	$this->error = $this->db->lasterror();
                         	dol_print_error($this->db);
                     	}
                         $this->db->rollback();
@@ -865,8 +865,8 @@ 
                 }
 
                 // update ref
-                $initialref='(PROV'.$this->id.')';
-                if (! empty($this->ref)) $initialref=$this->ref;
+                $initialref = '(PROV'.$this->id.')';
+                if (!empty($this->ref)) $initialref = $this->ref;
 
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
                 if ($this->db->query($sql))
@@ -876,16 +876,16 @@ 
                     	$this->ref = $initialref;
 
                         // Add object linked
-                        if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+                        if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
                         {
-                        	foreach($this->linked_objects as $origin => $tmp_origin_id)
+                        	foreach ($this->linked_objects as $origin => $tmp_origin_id)
                         	{
                         	    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
                         	    {
-                        	        foreach($tmp_origin_id as $origin_id)
+                        	        foreach ($tmp_origin_id as $origin_id)
                         	        {
                         	            $ret = $this->add_object_linked($origin, $origin_id);
-                        	            if (! $ret)
+                        	            if (!$ret)
                         	            {
                         	                dol_print_error($this->db);
                         	                $error++;
@@ -896,7 +896,7 @@ 
                         	    {
                         	        $origin_id = $tmp_origin_id;
                         	        $ret = $this->add_object_linked($origin, $origin_id);
-                        	        if (! $ret)
+                        	        if (!$ret)
                         	        {
                         	            dol_print_error($this->db);
                         	            $error++;
@@ -905,13 +905,13 @@ 
                         	}
                         }
 
-            			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+            			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
             			{
             				$originforcontact = $this->origin;
             				$originidforcontact = $this->origin_id;
                 		    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
                 		    {
-                		        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+                		        require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
                 		        $exp = new Expedition($db);
                 		        $exp->fetch($this->origin_id);
                 		        $exp->fetchObjectLinked();
@@ -928,36 +928,36 @@ 
                 		    }
 
                 		    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-                		    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+                		    $sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
 
                 		    $resqlcontact = $this->db->query($sqlcontact);
                 		    if ($resqlcontact)
                 		    {
-                		        while($objcontact = $this->db->fetch_object($resqlcontact))
+                		        while ($objcontact = $this->db->fetch_object($resqlcontact))
                 		        {
         					        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-                		            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+                		            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
                 		        }
                 		    }
                 		    else dol_print_error($resqlcontact);
                 		}
                     }
 
-                    if (! $error)
+                    if (!$error)
                     {
-                   		$result=$this->insertExtraFields();
+                   		$result = $this->insertExtraFields();
                    		if ($result < 0) $error++;
                     }
 
-                    if (! $error && ! $notrigger)
+                    if (!$error && !$notrigger)
                     {
 			            // Call trigger
-			            $result=$this->call_trigger('ORDER_CREATE',$user);
+			            $result = $this->call_trigger('ORDER_CREATE', $user);
 			            if ($result < 0) $error++;
 			            // End call triggers
                     }
 
-	                if (! $error)
+	                if (!$error)
 	                {
 		                $this->db->commit();
 		                return $this->id;
@@ -965,12 +965,12 @@ 
 	                else
 					{
 	                	$this->db->rollback();
-	                	return -1*$error;
+	                	return -1 * $error;
 					}
                 }
                 else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
@@ -991,70 +991,70 @@ 
      *	@param		int			$socid			Id of thirdparty
      *	@return		int							New id of clone
      */
-    function createFromClone($socid=0)
+    function createFromClone($socid = 0)
     {
-        global $user,$hookmanager;
+        global $user, $hookmanager;
 
-        $error=0;
+        $error = 0;
 
         $this->context['createfromclone'] = 'createfromclone';
 
         $this->db->begin();
 
 		// get lines 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;
 
         // Change socid if needed
-        if (! empty($socid) && $socid != $this->socid)
+        if (!empty($socid) && $socid != $this->socid)
         {
             $objsoc = new Societe($this->db);
 
-            if ($objsoc->fetch($socid)>0)
+            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->fk_delivery_address	= '';
+                $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->fk_delivery_address = '';
             }
 
             // TODO Change product price if multi-prices
         }
 
-        $this->id=0;
+        $this->id = 0;
 		$this->ref = '';
-        $this->statut=self::STATUS_DRAFT;
+        $this->statut = self::STATUS_DRAFT;
 
         // Clear fields
         $this->user_author_id     = $user->id;
         $this->user_valid         = '';
-		$this->date				  = dol_now();
-		$this->date_commande	  = dol_now();
+		$this->date = dol_now();
+		$this->date_commande = dol_now();
         $this->date_creation      = '';
         $this->date_validation    = '';
         $this->ref_client         = '';
 
         // 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('ORDER_CLONE',$user);
+            $result = $this->call_trigger('ORDER_CLONE', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
@@ -1062,7 +1062,7 @@ 
         unset($this->context['createfromclone']);
 
         // End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $this->id;
@@ -1083,17 +1083,17 @@ 
      */
     function createFromProposal($object)
     {
-        global $conf,$user,$hookmanager;
+        global $conf, $user, $hookmanager;
 
 		dol_include_once('/core/class/extrafields.class.php');
 
-        $error=0;
+        $error = 0;
 
 
         $this->date_commande = dol_now();
         $this->source = 0;
 
-        $num=count($object->lines);
+        $num = count($object->lines);
         for ($i = 0; $i < $num; $i++)
         {
             $line = new OrderLine($this->db);
@@ -1116,12 +1116,12 @@ 
             $line->rang              = $object->lines[$i]->rang;
             $line->special_code      = $object->lines[$i]->special_code;
             $line->fk_parent_line    = $object->lines[$i]->fk_parent_line;
-	        $line->fk_unit			 = $object->lines[$i]->fk_unit;
+	        $line->fk_unit = $object->lines[$i]->fk_unit;
 
-            $line->date_start      	= $object->lines[$i]->date_start;
-            $line->date_end    		= $object->lines[$i]->date_end;
+            $line->date_start = $object->lines[$i]->date_start;
+            $line->date_end = $object->lines[$i]->date_end;
 
-			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
+			$line->fk_fournprice = $object->lines[$i]->fk_fournprice;
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
 			$line->marge_tx			= $marginInfos[1];
@@ -1129,7 +1129,7 @@ 
 
             // get extrafields from original line
 			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
-			foreach($object->lines[$i]->array_options as $options_key => $value)
+			foreach ($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
 
 			$this->lines[$i] = $line;
@@ -1151,8 +1151,8 @@ 
         $this->note_private         = $object->note_private;
         $this->note_public          = $object->note_public;
 
-        $this->origin				= $object->element;
-        $this->origin_id			= $object->id;
+        $this->origin = $object->element;
+        $this->origin_id = $object->id;
 
         // get extrafields from original line
 		$object->fetch_optionals($object->id);
@@ -1160,14 +1160,14 @@ 
 		$e = new ExtraFields($this->db);
 		$element_extrafields = $e->fetch_name_optionals_label($this->element);
 
-		foreach($object->array_options as $options_key => $value) {
-			if(array_key_exists(str_replace('options_', '', $options_key), $element_extrafields)){
+		foreach ($object->array_options as $options_key => $value) {
+			if (array_key_exists(str_replace('options_', '', $options_key), $element_extrafields)) {
 				$this->array_options[$options_key] = $value;
 			}
 		}
         // Possibility to add external linked objects with hooks
         $this->linked_objects[$this->origin] = $this->origin_id;
-        if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
+        if (is_array($object->other_linked_objects) && !empty($object->other_linked_objects))
         {
            	$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
         }
@@ -1179,12 +1179,12 @@ 
             // Actions hooked (by external module)
             $hookmanager->initHooks(array('orderdao'));
 
-            $parameters=array('objFrom'=>$object);
-            $action='';
-            $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+            $parameters = array('objFrom'=>$object);
+            $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 (! $error)
+            if (!$error)
             {
                 // Ne pas passer par la commande provisoire
                 if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1)
@@ -1238,7 +1238,7 @@ 
      *	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)
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise = 0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0)
     {
     	global $mysoc, $conf, $langs, $user;
 
@@ -1247,34 +1247,34 @@ 
         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($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-        if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
-    	$pa_ht=price2num($pa_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($txtva)) $txtva = 0;
+        if (empty($txlocaltax1)) $txlocaltax1 = 0;
+        if (empty($txlocaltax2)) $txlocaltax2 = 0;
+        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
+        if (empty($this->fk_multicurrency)) $this->fk_multicurrency = 0;
+
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
+        $pu_ht = price2num($pu_ht);
+        $pu_ttc = price2num($pu_ttc);
+    	$pa_ht = price2num($pa_ht);
         $txtva = price2num($txtva);
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
-        if ($price_base_type=='HT')
+        if ($price_base_type == 'HT')
         {
-            $pu=$pu_ht;
+            $pu = $pu_ht;
         }
         else
         {
-            $pu=$pu_ttc;
+            $pu = $pu_ttc;
         }
-        $label=trim($label);
-        $desc=trim($desc);
+        $label = trim($label);
+        $desc = trim($desc);
 
         // Check parameters
         if ($type < 0) return -1;
@@ -1283,17 +1283,17 @@ 
         {
             $this->db->begin();
 
-        	$product_type=$type;
+        	$product_type = $type;
 			if (!empty($fk_product))
 			{
-				$product=new Product($this->db);
-				$result=$product->fetch($fk_product);
-				$product_type=$product->type;
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
 
-				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
 				{
                     $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
+				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
 					dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return self::STOCK_NOT_ENOUGH_FOR_ORDER;
@@ -1304,14 +1304,14 @@ 
             // 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);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
        		// Clean vat code
-    		$vat_src_code='';
+    		$vat_src_code = '';
     		if (preg_match('/\((.*)\)/', $txtva, $reg))
     		{
     		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+    		    $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, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
@@ -1324,7 +1324,7 @@ 
 			$pu_ht = $tabprice[3];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
@@ -1348,70 +1348,70 @@ 
             }
 
             // Insert line
-            $this->line=new OrderLine($this->db);
+            $this->line = new OrderLine($this->db);
 
             $this->line->context = $this->context;
 
-            $this->line->fk_commande=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-
-			$this->line->vat_src_code=$vat_src_code;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$localtaxes_type[1];
-            $this->line->localtax2_tx=$localtaxes_type[3];
-			$this->line->localtax1_type=$localtaxes_type[0];
-			$this->line->localtax2_type=$localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-			$this->line->product_type=$product_type;
-            $this->line->fk_remise_except=$fk_remise_except;
-            $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->origin=$origin;
-            $this->line->origin_id=$origin_id;
-            $this->line->fk_parent_line=$fk_parent_line;
-	        $this->line->fk_unit=$fk_unit;
-
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+            $this->line->fk_commande = $this->id;
+            $this->line->label = $label;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
+
+			$this->line->vat_src_code = $vat_src_code;
+            $this->line->tva_tx = $txtva;
+            $this->line->localtax1_tx = $localtaxes_type[1];
+            $this->line->localtax2_tx = $localtaxes_type[3];
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+            $this->line->fk_product = $fk_product;
+			$this->line->product_type = $product_type;
+            $this->line->fk_remise_except = $fk_remise_except;
+            $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->origin = $origin;
+            $this->line->origin_id = $origin_id;
+            $this->line->fk_parent_line = $fk_parent_line;
+	        $this->line->fk_unit = $fk_unit;
+
+            $this->line->date_start = $date_start;
+            $this->line->date_end = $date_end;
 
 			$this->line->fk_fournprice = $fk_fournprice;
 			$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		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
             // TODO Ne plus utiliser
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+            $this->line->price = $price;
+            $this->line->remise = $remise;
 
-			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_options;
+			if (is_array($array_options) && count($array_options) > 0) {
+				$this->line->array_options = $array_options;
 			}
 
-            $result=$this->line->insert($user);
+            $result = $this->line->insert($user);
             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 commande meme
-                $result=$this->update_price(1,'auto',0,$mysoc);	// 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, $mysoc); // 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();
@@ -1425,7 +1425,7 @@ 
             }
             else
             {
-                $this->error=$this->line->error;
+                $this->error = $this->line->error;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
@@ -1453,53 +1453,53 @@ 
      *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
      *			insere dans tableau $this->products
      */
-    function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='')
+    function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '')
     {
         global $conf, $mysoc;
 
-        if (! $qty) $qty = 1;
+        if (!$qty) $qty = 1;
 
         if ($idproduct > 0)
         {
-            $prod=new Product($this->db);
+            $prod = new Product($this->db);
             $prod->fetch($idproduct);
 
-            $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;
-            $vat_src_code = '';     // May be defined into tva_tx
+            $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;
+            $vat_src_code = ''; // May be defined into tva_tx
 
-            $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
-            $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
+            $localtax1_tx = get_localtax($tva_tx, 1, $this->thirdparty, $mysoc, $tva_npr);
+            $localtax2_tx = get_localtax($tva_tx, 2, $this->thirdparty, $mysoc, $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];
             else
             $price = $prod->price;
 
-            $line=new OrderLine($this->db);
+            $line = new OrderLine($this->db);
 
             $line->context = $this->context;
 
-            $line->fk_product=$idproduct;
-            $line->desc=$prod->description;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->vat_src_code=$vat_src_code;
-            $line->tva_tx=$tva_tx;
-            $line->localtax1_tx=$localtax1_tx;
-            $line->localtax2_tx=$localtax2_tx;
-            $line->ref=$prod->ref;
-            $line->libelle=$prod->label;
-            $line->product_desc=$prod->description;
-	        $line->fk_unit=$prod->fk_unit;
+            $line->fk_product = $idproduct;
+            $line->desc = $prod->description;
+            $line->qty = $qty;
+            $line->subprice = $price;
+            $line->remise_percent = $remise_percent;
+            $line->vat_src_code = $vat_src_code;
+            $line->tva_tx = $tva_tx;
+            $line->localtax1_tx = $localtax1_tx;
+            $line->localtax2_tx = $localtax2_tx;
+            $line->ref = $prod->ref;
+            $line->libelle = $prod->label;
+            $line->product_desc = $prod->description;
+	        $line->fk_unit = $prod->fk_unit;
 
             // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
             // Save the start and end date of the line in the object
             if ($date_start) { $line->date_start = $date_start; }
-            if ($date_end)   { $line->date_end = $date_end; }
+            if ($date_end) { $line->date_end = $date_end; }
 
             $this->lines[] = $line;
 
@@ -1536,39 +1536,39 @@ 
      * 	@param		string		$ref_int		Internal reference of other object
      *	@return     int         				>0 if OK, <0 if KO, 0 if not found
      */
-    function fetch($id, $ref='', $ref_ext='', $ref_int='')
+    function fetch($id, $ref = '', $ref_ext = '', $ref_int = '')
     {
 
         // Check parameters
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
         $sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
-        $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
-        $sql.= ', c.fk_account';
-        $sql.= ', c.date_commande';
-        $sql.= ', c.date_livraison';
-        $sql.= ', c.fk_shipping_method';
-        $sql.= ', c.fk_warehouse';
-        $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
-        $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
-        $sql.= ', c.fk_incoterms, c.location_incoterms';
-		$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
-        $sql.= ", i.libelle as libelle_incoterms";
-        $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-        $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
-        $sql.= ', ca.code as availability_code, ca.label as availability_label';
-        $sql.= ', dr.code as demand_reason_code';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term') . ')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement') . ')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
-        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
-        if ($id)   	  $sql.= " AND c.rowid=".$id;
-        if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
+        $sql .= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
+        $sql .= ', c.fk_account';
+        $sql .= ', c.date_commande';
+        $sql .= ', c.date_livraison';
+        $sql .= ', c.fk_shipping_method';
+        $sql .= ', c.fk_warehouse';
+        $sql .= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
+        $sql .= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
+        $sql .= ', c.fk_incoterms, c.location_incoterms';
+		$sql .= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
+        $sql .= ", i.libelle as libelle_incoterms";
+        $sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+        $sql .= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
+        $sql .= ', ca.code as availability_code, ca.label as availability_label';
+        $sql .= ', dr.code as demand_reason_code';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande as c';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN ('.getEntity('c_payment_term').')';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN ('.getEntity('c_paiement').')';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
+        $sql .= " WHERE c.entity IN (".getEntity('commande').")";
+        if ($id)   	  $sql .= " AND c.rowid=".$id;
+        if ($ref)     $sql .= " AND c.ref='".$this->db->escape($ref)."'";
+        if ($ref_ext) $sql .= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
+        if ($ref_int) $sql .= " AND c.ref_int='".$this->db->escape($ref_int)."'";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -1577,51 +1577,51 @@ 
             $obj = $this->db->fetch_object($result);
             if ($obj)
             {
-                $this->id					= $obj->rowid;
-                $this->ref					= $obj->ref;
-                $this->ref_client			= $obj->ref_client;
-                $this->ref_customer			= $obj->ref_client;
+                $this->id = $obj->rowid;
+                $this->ref = $obj->ref;
+                $this->ref_client = $obj->ref_client;
+                $this->ref_customer = $obj->ref_client;
                 $this->ref_ext				= $obj->ref_ext;
                 $this->ref_int				= $obj->ref_int;
-                $this->socid				= $obj->fk_soc;
-                $this->statut				= $obj->fk_statut;
-                $this->user_author_id		= $obj->fk_user_author;
-                $this->user_valid           = $obj->fk_user_valid;
+                $this->socid = $obj->fk_soc;
+                $this->statut = $obj->fk_statut;
+                $this->user_author_id = $obj->fk_user_author;
+                $this->user_valid = $obj->fk_user_valid;
                 $this->total_ht				= $obj->total_ht;
                 $this->total_tva			= $obj->total_tva;
                 $this->total_localtax1		= $obj->total_localtax1;
                 $this->total_localtax2		= $obj->total_localtax2;
                 $this->total_ttc			= $obj->total_ttc;
-                $this->date					= $this->db->jdate($obj->date_commande);
-                $this->date_commande		= $this->db->jdate($obj->date_commande);
+                $this->date = $this->db->jdate($obj->date_commande);
+                $this->date_commande = $this->db->jdate($obj->date_commande);
                 $this->remise				= $obj->remise;
                 $this->remise_percent		= $obj->remise_percent;
                 $this->remise_absolue		= $obj->remise_absolue;
                 $this->source				= $obj->source;
-                $this->facturee				= $obj->billed;			// deprecated
+                $this->facturee = $obj->billed; // deprecated
                 $this->billed				= $obj->billed;
-                $this->note					= $obj->note_private;	// deprecated
-                $this->note_private			= $obj->note_private;
-                $this->note_public			= $obj->note_public;
-                $this->fk_project			= $obj->fk_projet;
-                $this->modelpdf				= $obj->model_pdf;
+                $this->note = $obj->note_private; // deprecated
+                $this->note_private = $obj->note_private;
+                $this->note_public = $obj->note_public;
+                $this->fk_project = $obj->fk_projet;
+                $this->modelpdf = $obj->model_pdf;
                 $this->mode_reglement_id	= $obj->fk_mode_reglement;
                 $this->mode_reglement_code	= $obj->mode_reglement_code;
                 $this->mode_reglement		= $obj->mode_reglement_libelle;
                 $this->cond_reglement_id	= $obj->fk_cond_reglement;
                 $this->cond_reglement_code	= $obj->cond_reglement_code;
                 $this->cond_reglement		= $obj->cond_reglement_libelle;
-                $this->cond_reglement_doc	= $obj->cond_reglement_libelle_doc;
-                $this->fk_account           = $obj->fk_account;
-                $this->availability_id		= $obj->fk_availability;
+                $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
+                $this->fk_account = $obj->fk_account;
+                $this->availability_id = $obj->fk_availability;
                 $this->availability_code	= $obj->availability_code;
                 $this->availability	    	= $obj->availability_label;
                 $this->demand_reason_id		= $obj->fk_input_reason;
-                $this->demand_reason_code	= $obj->demand_reason_code;
-                $this->date_livraison		= $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-                $this->warehouse_id           = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
-                $this->fk_delivery_address	= $obj->fk_delivery_address;
+                $this->demand_reason_code = $obj->demand_reason_code;
+                $this->date_livraison = $this->db->jdate($obj->date_livraison);
+                $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+                $this->warehouse_id = ($obj->fk_warehouse > 0) ? $obj->fk_warehouse : null;
+                $this->fk_delivery_address = $obj->fk_delivery_address;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -1630,31 +1630,31 @@ 
 
 				// 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;
 
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
+                $this->extraparams = (array) json_decode($obj->extraparams, true);
 
-                $this->lines				= array();
+                $this->lines = array();
 
                 if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
                 // Retrieve all extrafields 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($result);
 
                 /*
                  * Lines
                  */
-                $result=$this->fetch_lines();
+                $result = $this->fetch_lines();
                 if ($result < 0)
                 {
                     return -3;
@@ -1663,13 +1663,13 @@ 
             }
             else
             {
-                $this->error='Order with id '.$id.' not found sql='.$sql;
+                $this->error = 'Order with id '.$id.' not found sql='.$sql;
                 return 0;
             }
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -1690,42 +1690,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;
             }
 
             $line = new OrderLine($this->db);
 
-            $line->fk_commande=$this->id;
-            $line->fk_remise_except=$remise->id;
-            $line->desc=$remise->description;   	// Description ligne
-            $line->vat_src_code=$remise->vat_src_code;
-            $line->tva_tx=$remise->tva_tx;
-            $line->subprice=-$remise->amount_ht;
-            $line->price=-$remise->amount_ht;
-            $line->fk_product=0;					// Id produit predefini
-            $line->qty=1;
-            $line->remise=0;
-            $line->remise_percent=0;
-            $line->rang=-1;
-            $line->info_bits=2;
+            $line->fk_commande = $this->id;
+            $line->fk_remise_except = $remise->id;
+            $line->desc = $remise->description; // Description ligne
+            $line->vat_src_code = $remise->vat_src_code;
+            $line->tva_tx = $remise->tva_tx;
+            $line->subprice = -$remise->amount_ht;
+            $line->price = -$remise->amount_ht;
+            $line->fk_product = 0; // Id produit predefini
+            $line->qty = 1;
+            $line->remise = 0;
+            $line->remise_percent = 0;
+            $line->rang = -1;
+            $line->info_bits = 2;
 
             $line->total_ht  = -$remise->amount_ht;
             $line->total_tva = -$remise->amount_tva;
             $line->total_ttc = -$remise->amount_ttc;
 
-            $result=$line->insert();
+            $result = $line->insert();
             if ($result > 0)
             {
-                $result=$this->update_price(1);
+                $result = $this->update_price(1);
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -1739,7 +1739,7 @@ 
             }
             else
             {
-                $this->error=$line->error;
+                $this->error = $line->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -1758,20 +1758,20 @@ 
      *	@param		int		$only_product	Return only physical products
      *	@return		int						<0 if KO, >0 if OK
      */
-    function fetch_lines($only_product=0)
+    function fetch_lines($only_product = 0)
     {
-        $this->lines=array();
+        $this->lines = array();
 
         $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-        $sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
-        $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
-	    $sql.= ' l.fk_unit,';
-		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
-        $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
-        $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
-        $sql.= ' WHERE l.fk_commande = '.$this->id;
+        $sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
+        $sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
+	    $sql .= ' l.fk_unit,';
+		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
+        $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
+        $sql .= ' p.weight, p.weight_units, p.volume, p.volume_units';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
+        $sql .= ' WHERE l.fk_commande = '.$this->id;
         if ($only_product) $sql .= ' AND p.fk_product_type = 0';
         $sql .= ' ORDER BY l.rang, l.rowid';
 
@@ -1794,17 +1794,17 @@ 
                 $line->commande_id      = $objp->fk_commande;
                 $line->label            = $objp->custom_label;
                 $line->desc             = $objp->description;
-                $line->description      = $objp->description;		// Description line
+                $line->description      = $objp->description; // Description line
                 $line->product_type     = $objp->product_type;
                 $line->qty              = $objp->qty;
 
                 $line->vat_src_code     = $objp->vat_src_code;
                 $line->tva_tx           = $objp->tva_tx;
-	            $line->localtax1_tx     = $objp->localtax1_tx;
+	            $line->localtax1_tx = $objp->localtax1_tx;
                 $line->localtax2_tx     = $objp->localtax2_tx;
 	            $line->localtax1_type	= $objp->localtax1_type;
 	            $line->localtax2_type	= $objp->localtax2_type;
-	            $line->total_ht         = $objp->total_ht;
+	            $line->total_ht = $objp->total_ht;
                 $line->total_ttc        = $objp->total_ttc;
                 $line->total_tva        = $objp->total_tva;
                 $line->total_localtax1  = $objp->total_localtax1;
@@ -1814,23 +1814,23 @@ 
                 $line->remise_percent   = $objp->remise_percent;
                 $line->price            = $objp->price;
                 $line->fk_product       = $objp->fk_product;
-				$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->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->rang             = $objp->rang;
                 $line->info_bits        = $objp->info_bits;
-                $line->special_code		= $objp->special_code;
-                $line->fk_parent_line	= $objp->fk_parent_line;
+                $line->special_code = $objp->special_code;
+                $line->fk_parent_line = $objp->fk_parent_line;
 
-                $line->ref				= $objp->product_ref;
-                $line->product_ref		= $objp->product_ref;
-                $line->libelle			= $objp->product_label;
-                $line->product_label	= $objp->product_label;
+                $line->ref = $objp->product_ref;
+                $line->product_ref = $objp->product_ref;
+                $line->libelle = $objp->product_label;
+                $line->product_label = $objp->product_label;
                 $line->product_desc     = $objp->product_desc;
                 $line->product_tobatch  = $objp->product_tobatch;
-                $line->fk_product_type  = $objp->fk_product_type;	// Produit ou service
+                $line->fk_product_type  = $objp->fk_product_type; // Produit ou service
 	            $line->fk_unit          = $objp->fk_unit;
 
 	            $line->weight           = $objp->weight;
@@ -1842,8 +1842,8 @@ 
                 $line->date_end         = $this->db->jdate($objp->date_end);
 
 				// 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;
@@ -1860,7 +1860,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -1873,8 +1873,8 @@ 
      */
     function getNbOfProductsLines()
     {
-        $nb=0;
-        foreach($this->lines as $line)
+        $nb = 0;
+        foreach ($this->lines as $line)
         {
             if ($line->product_type == 0) $nb++;
         }
@@ -1888,8 +1888,8 @@ 
      */
     function getNbOfServicesLines()
     {
-        $nb=0;
-        foreach($this->lines as $line)
+        $nb = 0;
+        foreach ($this->lines as $line)
         {
             if ($line->product_type == 1) $nb++;
         }
@@ -1903,22 +1903,22 @@ 
      *	@param      int		$filtre_statut      Filter on shipment status
      * 	@return     int                			<0 if KO, Nb of lines found if OK
      */
-    function loadExpeditions($filtre_statut=-1)
+    function loadExpeditions($filtre_statut = -1)
     {
         $this->expeditions = array();
 
         $sql = 'SELECT cd.rowid, cd.fk_product,';
-        $sql.= ' sum(ed.qty) as qty';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
-        if ($filtre_statut >= 0) $sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
-        $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
-        $sql.= ' WHERE';
-        if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
-        $sql.= ' ed.fk_origin_line = cd.rowid';
-        $sql.= ' AND cd.fk_commande =' .$this->id;
-        if ($this->fk_product > 0) $sql.= ' AND cd.fk_product = '.$this->fk_product;
-        if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
-        $sql.= ' GROUP BY cd.rowid, cd.fk_product';
+        $sql .= ' sum(ed.qty) as qty';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
+        if ($filtre_statut >= 0) $sql .= ' '.MAIN_DB_PREFIX.'expedition as e,';
+        $sql .= ' '.MAIN_DB_PREFIX.'commandedet as cd';
+        $sql .= ' WHERE';
+        if ($filtre_statut >= 0) $sql .= ' ed.fk_expedition = e.rowid AND';
+        $sql .= ' ed.fk_origin_line = cd.rowid';
+        $sql .= ' AND cd.fk_commande ='.$this->id;
+        if ($this->fk_product > 0) $sql .= ' AND cd.fk_product = '.$this->fk_product;
+        if ($filtre_statut >= 0) $sql .= ' AND e.fk_statut >= '.$filtre_statut;
+        $sql .= ' GROUP BY cd.rowid, cd.fk_product';
         //print $sql;
 
         dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
@@ -1938,7 +1938,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
 
@@ -1954,11 +1954,11 @@ 
     function nb_expedition()
     {
         $sql = 'SELECT count(*)';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
-        $sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
-        $sql.= ' WHERE el.fk_source = '.$this->id;
-        $sql.= " AND el.fk_target = e.rowid";
-        $sql.= " AND el.targettype = 'shipping'";
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
+        $sql .= ', '.MAIN_DB_PREFIX.'element_element as el';
+        $sql .= ' WHERE el.fk_source = '.$this->id;
+        $sql .= " AND el.fk_target = e.rowid";
+        $sql .= " AND el.targettype = 'shipping'";
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -1977,21 +1977,21 @@ 
      *
      *	TODO		FONCTION NON FINIE A FINIR
      */
-    function stock_array($filtre_statut=self::STATUS_CANCELED)
+    function stock_array($filtre_statut = self::STATUS_CANCELED)
     {
         $this->stocks = array();
 
         // Tableau des id de produit de la commande
-		$array_of_product=array();
+		$array_of_product = array();
 
         // Recherche total en stock pour chaque produit
         // TODO $array_of_product est défini vide juste au dessus !!
         if (count($array_of_product))
         {
             $sql = "SELECT fk_product, sum(ps.reel) as total";
-            $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-            $sql.= " WHERE ps.fk_product IN (".join(',',$array_of_product).")";
-            $sql.= ' GROUP BY fk_product ';
+            $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+            $sql .= " WHERE ps.fk_product IN (".join(',', $array_of_product).")";
+            $sql .= ' GROUP BY fk_product ';
             $result = $this->db->query($sql);
             if ($result)
             {
@@ -2016,7 +2016,7 @@ 
      *  @param      int		$lineid		Id of line to delete
      *  @return     int        		 	>0 if OK, 0 if nothing to do, <0 if KO
      */
-    function deleteline($user=null, $lineid=0)
+    function deleteline($user = null, $lineid = 0)
     {
 
         if ($this->statut == self::STATUS_DRAFT)
@@ -2024,8 +2024,8 @@ 
             $this->db->begin();
 
             $sql = "SELECT fk_product, qty";
-            $sql.= " FROM ".MAIN_DB_PREFIX."commandedet";
-            $sql.= " WHERE rowid = ".$lineid;
+            $sql .= " FROM ".MAIN_DB_PREFIX."commandedet";
+            $sql .= " WHERE rowid = ".$lineid;
 
             $result = $this->db->query($sql);
             if ($result)
@@ -2045,7 +2045,7 @@ 
 
                     if ($line->delete($user) > 0)
                     {
-                        $result=$this->update_price(1);
+                        $result = $this->update_price(1);
 
                         if ($result > 0)
                         {
@@ -2055,14 +2055,14 @@ 
                         else
                         {
                             $this->db->rollback();
-                            $this->error=$this->db->lasterror();
+                            $this->error = $this->db->lasterror();
                             return -1;
                         }
                     }
                     else
                     {
                         $this->db->rollback();
-                        $this->error=$line->error;
+                        $this->error = $line->error;
                         return -1;
                     }
                 }
@@ -2075,7 +2075,7 @@ 
             else
             {
                 $this->db->rollback();
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 return -1;
             }
         }
@@ -2093,59 +2093,59 @@ 
      * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return		int 					<0 if KO, >0 if OK
      */
-    function set_remise($user, $remise, $notrigger=0)
+    function set_remise($user, $remise, $notrigger = 0)
     {
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
         if ($user->rights->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
-            $remise=price2num($remise);
+            $remise = price2num($remise);
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET remise_percent = '.$remise;
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
+            $sql .= ' SET remise_percent = '.$remise;
+            $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->remise_percent = $remise;
             	$this->update_price(1);
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -2159,59 +2159,59 @@ 
      * 		@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
      *		@return		int 					<0 if KO, >0 if OK
      */
-    function set_remise_absolue($user, $remise, $notrigger=0)
+    function set_remise_absolue($user, $remise, $notrigger = 0)
     {
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
         if ($user->rights->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
-            $remise=price2num($remise);
+            $remise = price2num($remise);
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET remise_absolue = '.$remise;
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
+            $sql .= ' SET remise_absolue = '.$remise;
+            $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->remise_absolue = $remise;
             	$this->update_price(1);
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
     }
@@ -2225,54 +2225,54 @@ 
      * 	@param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return     int         		<0 if KO, >0 if OK
      */
-    function set_date($user, $date, $notrigger=0)
+    function set_date($user, $date, $notrigger = 0)
     {
         if ($user->rights->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-            $sql.= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+            $sql .= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->date = $date;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
@@ -2289,54 +2289,54 @@ 
      *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
      *	@return     int         				<0 si ko, >0 si ok
      */
-    function set_date_livraison($user, $date_livraison, $notrigger=0)
+    function set_date_livraison($user, $date_livraison, $notrigger = 0)
     {
         if ($user->rights->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-            $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;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->date_livraison = $date_livraison;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
@@ -2358,30 +2358,30 @@ 
      *  @param    	string	$sortorder		Sort order
      *  @return     int             		-1 if KO, array with result if OK
      */
-    function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='c.date_commande', $sortorder='DESC')
+    function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC')
     {
         global $user;
 
         $ga = array();
 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " c.rowid as cid, c.ref";
-        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."commande as c";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
-        $sql.= " AND c.fk_soc = s.rowid";
-        if (! $user->rights->societe->client->voir && ! $socid) //restriction
+        $sql .= " c.rowid as cid, c.ref";
+        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."commande as c";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= " WHERE c.entity IN (".getEntity('commande').")";
+        $sql .= " AND c.fk_soc = s.rowid";
+        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 c.fk_statut = ".self::STATUS_DRAFT;
-        if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
-        $sql.= $this->db->order($sortfield,$sortorder);
-        $sql.= $this->db->plimit($limit,$offset);
+        if ($socid) $sql .= " AND s.rowid = ".$socid;
+        if ($draft) $sql .= " AND c.fk_statut = ".self::STATUS_DRAFT;
+        if (is_object($excluser)) $sql .= " AND c.fk_user_author <> ".$excluser->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)
         {
             $numc = $this->db->num_rows($result);
@@ -2402,7 +2402,7 @@ 
                     }
                     else
 					{
-                    	$ga[$i]['id']	= $obj->cid;
+                    	$ga[$i]['id'] = $obj->cid;
                     	$ga[$i]['ref'] 	= $obj->ref;
                     	$ga[$i]['name'] = $obj->name;
                     }
@@ -2425,14 +2425,14 @@ 
      *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
      *	@return     int         				>0 if OK, <0 if KO
      */
-    function availability($availability_id, $notrigger=0)
+    function availability($availability_id, $notrigger = 0)
     {
         global $user;
 
         dol_syslog('Commande::availability('.$availability_id.')');
         if ($this->statut >= self::STATUS_DRAFT)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
@@ -2441,49 +2441,49 @@ 
             $sql .= ' WHERE rowid='.$this->id;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->availability_id = $availability_id;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
         {
-        	$error_str='Command status do not meet requirement '.$this->statut;
+        	$error_str = 'Command status do not meet requirement '.$this->statut;
             dol_syslog(__METHOD__.$error_str, LOG_ERR);
-            $this->error=$error_str;
-            $this->errors[]= $this->error;
+            $this->error = $error_str;
+            $this->errors[] = $this->error;
             return -2;
         }
     }
@@ -2495,14 +2495,14 @@ 
      *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
      *  @return     int        			 		>0 if ok, <0 if ko
      */
-    function demand_reason($demand_reason_id, $notrigger=0)
+    function demand_reason($demand_reason_id, $notrigger = 0)
     {
         global $user;
 
         dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
         if ($this->statut >= self::STATUS_DRAFT)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
@@ -2511,49 +2511,49 @@ 
             $sql .= ' WHERE rowid='.$this->id;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->demand_reason_id = $demand_reason_id;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
         {
-        	$error_str='order status do not meet requirement '.$this->statut;
+        	$error_str = 'order status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
-        	$this->error=$error_str;
-        	$this->errors[]= $this->error;
+        	$this->error = $error_str;
+        	$this->errors[] = $this->error;
             return -2;
         }
     }
@@ -2566,53 +2566,53 @@ 
      *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *	@return     int             		<0 if KO, >0 if OK
      */
-    function set_ref_client($user, $ref_client, $notrigger=0)
+    function set_ref_client($user, $ref_client, $notrigger = 0)
     {
         if ($user->rights->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
-            $sql.= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
-            $sql.= ' WHERE rowid = '.$this->id;
+            $sql .= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
+            $sql .= ' WHERE rowid = '.$this->id;
 
             dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->ref_client = $ref_client;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$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
@@ -2628,53 +2628,53 @@ 
 	 * @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 * @return	int                 <0 if KO, >0 if OK
 	 */
-	function classifyBilled(User $user, $notrigger=0)
+	function classifyBilled(User $user, $notrigger = 0)
 	{
         $error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
-		$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
 		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 
-			if (! $error)
+			if (!$error)
 			{
-				$this->oldcopy= clone $this;
-				$this->facturee=1; // deprecated
-				$this->billed=1;
+				$this->oldcopy = clone $this;
+				$this->facturee = 1; // deprecated
+				$this->billed = 1;
 			}
 
-			if (! $notrigger && empty($error))
+			if (!$notrigger && empty($error))
 			{
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
+            	$result = $this->call_trigger('ORDER_CLASSIFY_BILLED', $user);
             	if ($result < 0) $error++;
             	// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
 			}
 			else
 			{
-				foreach($this->errors as $errmsg)
+				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyBilled ".$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
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
             $this->db->rollback();
 			return -1;
 		}
@@ -2690,7 +2690,7 @@ 
 	function classer_facturee()
 	{
 	    global $user;
-		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+		dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
 
 		return $this->classifyBilled($user);
 	}
@@ -2708,45 +2708,45 @@ 
 	    $this->db->begin();
 
 	    $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 0';
-	    $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+	    $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
 	    dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
 	    if ($this->db->query($sql))
 	    {
-	    	if (! $error)
+	    	if (!$error)
 	    	{
-	    		$this->oldcopy= clone $this;
-	    		$this->facturee=1; // deprecated
-	    		$this->billed=1;
+	    		$this->oldcopy = clone $this;
+	    		$this->facturee = 1; // deprecated
+	    		$this->billed = 1;
 	    	}
 
 	        // Call trigger
-	        $result=$this->call_trigger('ORDER_CLASSIFY_UNBILLED',$user);
+	        $result = $this->call_trigger('ORDER_CLASSIFY_UNBILLED', $user);
 	        if ($result < 0) $error++;
 	        // End call triggers
 
-	        if (! $error)
+	        if (!$error)
 	        {
-	            $this->facturee=0; // deprecated
-	            $this->billed=0;
+	            $this->facturee = 0; // deprecated
+	            $this->billed = 0;
 
 	            $this->db->commit();
 	            return 1;
 	        }
 	        else
 	        {
-	            foreach($this->errors as $errmsg)
+	            foreach ($this->errors as $errmsg)
 	            {
 	                dol_syslog(get_class($this)."::classifyUnBilled ".$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
 	    {
-	        $this->error=$this->db->error();
+	        $this->error = $this->db->error();
 	        $this->db->rollback();
 	        return -1;
 	    }
@@ -2781,51 +2781,51 @@ 
      * 	@param		int				$notrigger			disable line update trigger
      *  @return   	int              					< 0 if KO, > 0 if OK
      */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
     {
         global $conf, $mysoc, $langs, $user;
 
         dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        if (! empty($this->brouillon))
+        if (!empty($this->brouillon))
         {
             $this->db->begin();
 
             // Clean parameters
-            if (empty($qty)) $qty=0;
-            if (empty($info_bits)) $info_bits=0;
-            if (empty($txtva)) $txtva=0;
-            if (empty($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2)) $txlocaltax2=0;
-            if (empty($remise)) $remise=0;
-            if (empty($remise_percent)) $remise_percent=0;
-            if (empty($special_code) || $special_code == 3) $special_code=0;
-
-            $remise_percent=price2num($remise_percent);
-            $qty=price2num($qty);
+            if (empty($qty)) $qty = 0;
+            if (empty($info_bits)) $info_bits = 0;
+            if (empty($txtva)) $txtva = 0;
+            if (empty($txlocaltax1)) $txlocaltax1 = 0;
+            if (empty($txlocaltax2)) $txlocaltax2 = 0;
+            if (empty($remise)) $remise = 0;
+            if (empty($remise_percent)) $remise_percent = 0;
+            if (empty($special_code) || $special_code == 3) $special_code = 0;
+
+            $remise_percent = price2num($remise_percent);
+            $qty = price2num($qty);
             $pu = price2num($pu);
-      		$pa_ht=price2num($pa_ht);
-            $txtva=price2num($txtva);
-            $txlocaltax1=price2num($txlocaltax1);
-            $txlocaltax2=price2num($txlocaltax2);
+      		$pa_ht = price2num($pa_ht);
+            $txtva = price2num($txtva);
+            $txlocaltax1 = price2num($txlocaltax1);
+            $txlocaltax2 = price2num($txlocaltax2);
 
             // 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);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
        		// Clean vat code
-    		$vat_src_code='';
+    		$vat_src_code = '';
     		if (preg_match('/\((.*)\)/', $txtva, $reg))
     		{
     		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+    		    $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, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
 
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
@@ -2837,7 +2837,7 @@ 
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
@@ -2855,7 +2855,7 @@ 
             $remise = 0;
             if ($remise_percent > 0)
             {
-                $remise = round(($pu * $remise_percent / 100),2);
+                $remise = round(($pu * $remise_percent / 100), 2);
                 $price = ($pu - $remise);
             }
 
@@ -2865,14 +2865,14 @@ 
 
             if (!empty($line->fk_product))
             {
-                $product=new Product($this->db);
-                $result=$product->fetch($line->fk_product);
-                $product_type=$product->type;
+                $product = new Product($this->db);
+                $result = $product->fetch($line->fk_product);
+                $product_type = $product->type;
 
-                if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+                if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
                 {
                     $langs->load("errors");
-                    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
+                    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
                     dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
                     $this->db->rollback();
                     return self::STOCK_NOT_ENOUGH_FOR_ORDER;
@@ -2886,18 +2886,18 @@ 
             $this->line->context = $this->context;
 
             // 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;
             }
 
-            $this->line->rowid=$rowid;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
+            $this->line->rowid = $rowid;
+            $this->line->label = $label;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
 
-            $this->line->vat_src_code	= $vat_src_code;
+            $this->line->vat_src_code = $vat_src_code;
             $this->line->tva_tx         = $txtva;
             $this->line->localtax1_tx   = $txlocaltax1;
             $this->line->localtax2_tx   = $txlocaltax2;
@@ -2909,15 +2909,15 @@ 
             $this->line->special_code   = $special_code;
             $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_localtax1 = $total_localtax1;
+            $this->line->total_localtax2 = $total_localtax2;
             $this->line->total_ttc      = $total_ttc;
             $this->line->date_start     = $date_start;
             $this->line->date_end       = $date_end;
             $this->line->product_type   = $type;
             $this->line->fk_parent_line = $fk_parent_line;
-            $this->line->skip_update_total=$skip_update_total;
-	        $this->line->fk_unit        = $fk_unit;
+            $this->line->skip_update_total = $skip_update_total;
+	        $this->line->fk_unit = $fk_unit;
 
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
@@ -2929,18 +2929,18 @@ 
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
             // TODO deprecated
-            $this->line->price=$price;
-            $this->line->remise=$remise;
+            $this->line->price = $price;
+            $this->line->remise = $remise;
 
-			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_options;
+			if (is_array($array_options) && count($array_options) > 0) {
+				$this->line->array_options = $array_options;
 			}
 
-            $result=$this->line->update($user, $notrigger);
+            $result = $this->line->update($user, $notrigger);
             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 info denormalisees
                 $this->update_price(1);
@@ -2950,7 +2950,7 @@ 
             }
             else
             {
-	            $this->error=$this->line->error;
+	            $this->error = $this->line->error;
 
 	            $this->db->rollback();
 	            return -1;
@@ -2958,8 +2958,8 @@ 
         }
         else
         {
-            $this->error=get_class($this)."::updateline Order status makes operation forbidden";
-        	$this->errors=array('OrderStatusMakeOperationForbidden');
+            $this->error = get_class($this)."::updateline Order status makes operation forbidden";
+        	$this->errors = array('OrderStatusMakeOperationForbidden');
             return -2;
         }
     }
@@ -2971,17 +2971,17 @@ 
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *      @return     int      			   	<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client=trim($this->ref_client);
-		if (isset($this->note) || isset($this->note_private)) $this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
+		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -2989,44 +2989,44 @@ 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande SET";
 
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_client=".(isset($this->ref_client)?"'".$this->db->escape($this->ref_client)."'":"null").",";
-		$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
-		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
-		$sql.= " date_commande=".(strval($this->date_commande)!='' ? "'".$this->db->idate($this->date_commande)."'" : 'null').",";
-		$sql.= " date_valid=".(strval($this->date_validation)!='' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
-		$sql.= " tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
-		$sql.= " localtax1=".(isset($this->total_localtax1)?$this->total_localtax1:"null").",";
-		$sql.= " localtax2=".(isset($this->total_localtax2)?$this->total_localtax2:"null").",";
-		$sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
-		$sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
-		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " fk_user_author=".(isset($this->user_author_id)?$this->user_author_id:"null").",";
-		$sql.= " fk_user_valid=".(isset($this->user_valid)?$this->user_valid:"null").",";
-		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-		$sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
-		$sql.= " fk_mode_reglement=".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"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.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
-
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_client=".(isset($this->ref_client) ? "'".$this->db->escape($this->ref_client)."'" : "null").",";
+		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
+		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
+		$sql .= " date_commande=".(strval($this->date_commande) != '' ? "'".$this->db->idate($this->date_commande)."'" : 'null').",";
+		$sql .= " date_valid=".(strval($this->date_validation) != '' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
+		$sql .= " tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
+		$sql .= " localtax1=".(isset($this->total_localtax1) ? $this->total_localtax1 : "null").",";
+		$sql .= " localtax2=".(isset($this->total_localtax2) ? $this->total_localtax2 : "null").",";
+		$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
+		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
+		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " fk_user_author=".(isset($this->user_author_id) ? $this->user_author_id : "null").",";
+		$sql .= " fk_user_valid=".(isset($this->user_valid) ? $this->user_valid : "null").",";
+		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "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 .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "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)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('ORDER_MODIFY',$user);
+	            $result = $this->call_trigger('ORDER_MODIFY', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
@@ -3035,13 +3035,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			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
 		{
@@ -3060,19 +3060,19 @@ 
     {
         global $hookmanager, $conf;
 
-    	$action='create';
+    	$action = 'create';
         $error = 0;
 
     	// Actions on extra fields (by external module or standard code)
     	// TODO le hook fait double emploi avec le trigger !!
     	$hookmanager->initHooks(array('orderdao'));
-    	$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++;
@@ -3099,42 +3099,42 @@ 
      *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      * 	@return	int					<=0 if KO, >0 if OK
      */
-    function delete($user, $notrigger=0)
+    function delete($user, $notrigger = 0)
     {
         global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $error = 0;
 
-        dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete ".$this->id, LOG_DEBUG);
 
         $this->db->begin();
 
-        if (! $error && ! $notrigger)
+        if (!$error && !$notrigger)
         {
             // Call trigger
-            $result=$this->call_trigger('ORDER_DELETE',$user);
+            $result = $this->call_trigger('ORDER_DELETE', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
 
         //TODO: Check for error after each action. If one failed we rollback, don't waste time to do action if previous fail
-        if (! $error)
+        if (!$error)
         {
         	// Delete order details
         	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
-        	if (! $this->db->query($sql) )
+        	if (!$this->db->query($sql))
         	{
         		$error++;
-        		$this->errors[]=$this->db->lasterror();
+        		$this->errors[] = $this->db->lasterror();
         	}
 
         	// Delete order
         	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
-        	if (! $this->db->query($sql) )
+        	if (!$this->db->query($sql))
         	{
         		$error++;
-        		$this->errors[]=$this->db->lasterror();
+        		$this->errors[] = $this->db->lasterror();
         	}
 
         	// Delete linked object
@@ -3146,9 +3146,9 @@ 
         	if ($res < 0) $error++;
 
         	// 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
         	{
-        		$result=$this->deleteExtraFields();
+        		$result = $this->deleteExtraFields();
         		if ($result < 0)
         		{
         			$error++;
@@ -3160,13 +3160,13 @@ 
         	$comref = dol_sanitizeFileName($this->ref);
         	if ($conf->commande->dir_output && !empty($this->ref))
         	{
-        		$dir = $conf->commande->dir_output . "/" . $comref ;
-        		$file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
+        		$dir = $conf->commande->dir_output."/".$comref;
+        		$file = $conf->commande->dir_output."/".$comref."/".$comref.".pdf";
         		if (file_exists($file))	// We must delete all files before deleting directory
         		{
         			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->db->rollback();
         				return 0;
@@ -3174,9 +3174,9 @@ 
         		}
         		if (file_exists($dir))
         		{
-        			if (! dol_delete_dir_recursive($dir))
+        			if (!dol_delete_dir_recursive($dir))
         			{
-        				$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+        				$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
         				$this->db->rollback();
         				return 0;
         			}
@@ -3186,19 +3186,19 @@ 
 
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$this->db->commit();
         	return 1;
         }
         else
         {
-	        foreach($this->errors as $errmsg)
+	        foreach ($this->errors as $errmsg)
 	        {
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
+		        $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 	        }
 	        $this->db->rollback();
-	        return -1*$error;
+	        return -1 * $error;
         }
     }
 
@@ -3216,30 +3216,30 @@ 
         $clause = " WHERE";
 
         $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." c.entity IN (".getEntity('commande').")";
+        $sql .= $clause." c.entity IN (".getEntity('commande').")";
         //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
-        $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+        $sql .= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
+        if ($user->societe_id) $sql .= " AND c.fk_soc = ".$user->societe_id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
-	        $response->label=$langs->trans("OrdersToProcess");
-	        $response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
-	        $response->img=img_object('',"order");
+	        $response->warning_delay = $conf->commande->client->warning_delay / 60 / 60 / 24;
+	        $response->label = $langs->trans("OrdersToProcess");
+	        $response->url = DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
+	        $response->img = img_object('', "order");
 
             $generic_commande = new Commande($this->db);
 
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
 
@@ -3256,7 +3256,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -3270,7 +3270,7 @@ 
     {
         global $langs;
 
-        $label=$langs->trans('OrderSource'.$this->source);
+        $label = $langs->trans('OrderSource'.$this->source);
 
         if ($label == 'OrderSource') return '';
         return $label;
@@ -3284,8 +3284,8 @@ 
      */
     function getLibStatut($mode)
     {
-        if ($this->facturee && empty($this->billed)) $this->billed=$this->facturee; // For backward compatibility
-        return $this->LibStatut($this->statut,$this->billed,$mode);
+        if ($this->facturee && empty($this->billed)) $this->billed = $this->facturee; // For backward compatibility
+        return $this->LibStatut($this->statut, $this->billed, $mode);
     }
 
     /**
@@ -3297,73 +3297,73 @@ 
      *  @param      int     $donotshowbilled  Do not show billed status after order status
      *  @return     string					  Label of status
      */
-    function LibStatut($statut,$billed,$mode,$donotshowbilled=0)
+    function LibStatut($statut, $billed, $mode, $donotshowbilled = 0)
     {
         global $langs, $conf;
 
         $billedtext = '';
-        if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
+        if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->trans("Billed") : '');
 
         //print 'x'.$statut.'-'.$billed;
         if ($mode == 0)
         {
-            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
-            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
-            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
+            if ($statut == self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
+            if ($statut == self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
+            if ($statut == self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
+            if ($statut == self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
+            if ($statut == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 1)
         {
-            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
-            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
-            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
+            if ($statut == self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
+            if ($statut == self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
+            if ($statut == self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
+            if ($statut == self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
+            if ($statut == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 2)
         {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
+            if ($statut == self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'), 'statut5').' '.$langs->trans('StatusOrderCanceledShort');
+            if ($statut == self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'), 'statut0').' '.$langs->trans('StatusOrderDraftShort');
+            if ($statut == self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'), 'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
+            if ($statut == self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'), 'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'), 'statut4').' '.$langs->trans('StatusOrderToBillShort');
+            if ($statut == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext, 'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'), 'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
         }
         elseif ($mode == 3)
         {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+            if ($statut == self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'), 'statut5');
+            if ($statut == self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'), 'statut0');
+            if ($statut == self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext, 'statut1');
+            if ($statut == self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext, 'statut3');
+            if ($statut == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'), 'statut4');
+            if ($statut == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext, 'statut6');
+            if ($statut == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'), 'statut6');
         }
         elseif ($mode == 4)
         {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
+            if ($statut == self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'), 'statut5').' '.$langs->trans('StatusOrderCanceled');
+            if ($statut == self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'), 'statut0').' '.$langs->trans('StatusOrderDraft');
+            if ($statut == self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext, 'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
+            if ($statut == self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext, 'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'), 'statut4').' '.$langs->trans('StatusOrderToBill');
+            if ($statut == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext, 'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+            if ($statut == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'), 'statut6').' '.$langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 5)
         {
-            if ($statut==self::STATUS_CANCELED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderCanceledShort').' </span>'.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==self::STATUS_DRAFT) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
-            if ($statut==self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut4');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+            if ($statut == self::STATUS_CANCELED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderCanceledShort').' </span>'.img_picto($langs->trans('StatusOrderCanceled'), 'statut5');
+            if ($statut == self::STATUS_DRAFT) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'), 'statut0');
+            if ($statut == self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext, 'statut1');
+            if ($statut == self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext, 'statut3');
+            if ($statut == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'), 'statut4');
+            if ($statut == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext, 'statut6');
+            if ($statut == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'), 'statut6');
         }
     }
 
@@ -3379,23 +3379,23 @@ 
      *  @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='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
+    function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
     {
         global $conf, $langs, $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
 
-        $result='';
+        $result = '';
 
-        if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
+        if (!empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
         else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
 
         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';
         }
 
         if ($short) return $url;
@@ -3411,32 +3411,32 @@ 
 				$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);
+				$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);
 			}
 		}
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip) && $user->rights->commande->lire)
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		    {
-		        $label=$langs->trans("ShowOrder");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		        $label = $langs->trans("ShowOrder");
+		        $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>';
 
-        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;
+        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;
     }
 
@@ -3450,12 +3450,12 @@ 
     function info($id)
     {
         $sql = 'SELECT c.rowid, date_creation as datec, tms as datem,';
-        $sql.= ' date_valid as datev,';
-        $sql.= ' date_cloture as datecloture,';
-        $sql.= ' fk_user_author, fk_user_valid, fk_user_cloture';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
-        $sql.= ' WHERE c.rowid = '.$id;
-        $result=$this->db->query($sql);
+        $sql .= ' date_valid as datev,';
+        $sql .= ' date_cloture as datecloture,';
+        $sql .= ' fk_user_author, fk_user_valid, fk_user_cloture';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande as c';
+        $sql .= ' WHERE c.rowid = '.$id;
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
@@ -3466,7 +3466,7 @@ 
                 {
                     $cuser = new User($this->db);
                     $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation   = $cuser;
+                    $this->user_creation = $cuser;
                 }
 
                 if ($obj->fk_user_valid)
@@ -3480,7 +3480,7 @@ 
                 {
                     $cluser = new User($this->db);
                     $cluser->fetch($obj->fk_user_cloture);
-                    $this->user_cloture   = $cluser;
+                    $this->user_cloture = $cluser;
                 }
 
                 $this->date_creation     = $this->db->jdate($obj->datec);
@@ -3516,8 +3516,8 @@ 
         $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)
         {
@@ -3532,52 +3532,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->date_lim_reglement=$this->date+3600*24*30;
+        $this->date_lim_reglement = $this->date + 3600 * 24 * 30;
         $this->cond_reglement_code = 'RECEP';
         $this->mode_reglement_code = 'CHQ';
         $this->availability_code   = 'DSP';
         $this->demand_reason_code  = 'SRC_00';
-        $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 OrderLine($this->db);
+            $line = new OrderLine($this->db);
 
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=20;
+            $line->desc = $langs->trans("Description")." ".$xnbp;
+            $line->qty = 1;
+            $line->subprice = 100;
+            $line->price = 100;
+            $line->tva_tx = 20;
             if ($xnbp == 2)
             {
-                $line->total_ht=50;
-                $line->total_ttc=60;
-                $line->total_tva=10;
-                $line->remise_percent=50;
+                $line->total_ht = 50;
+                $line->total_ttc = 60;
+                $line->total_tva = 10;
+                $line->remise_percent = 50;
             }
             else
             {
-                $line->total_ht=100;
-                $line->total_ttc=120;
-                $line->total_tva=20;
-                $line->remise_percent=0;
+                $line->total_ht = 100;
+                $line->total_ttc = 120;
+                $line->total_tva = 20;
+                $line->remise_percent = 0;
             }
             if ($num_prods > 0)
             {
             	$prodid = mt_rand(1, $num_prods);
-            	$line->fk_product=$prodids[$prodid];
-				$line->product_ref='SPECIMEN';
+            	$line->fk_product = $prodids[$prodid];
+				$line->product_ref = 'SPECIMEN';
             }
 
-            $this->lines[$xnbp]=$line;
+            $this->lines[$xnbp] = $line;
 
             $this->total_ht       += $line->total_ht;
             $this->total_tva      += $line->total_tva;
@@ -3597,26 +3597,26 @@ 
     {
         global $user;
 
-        $this->nb=array();
+        $this->nb = array();
         $clause = "WHERE";
 
         $sql = "SELECT count(co.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande as co";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.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." co.entity IN (".getEntity('commande').")";
+        $sql .= " ".$clause." co.entity IN (".getEntity('commande').")";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $this->nb["orders"]=$obj->nb;
+                $this->nb["orders"] = $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -3624,7 +3624,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -3649,19 +3649,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("orders");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'einstein';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->COMMANDE_ADDON_PDF)) {
+			} elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_ADDON_PDF;
 			}
 		}
@@ -3698,8 +3698,8 @@ 
     {
         global $conf;
 
-        if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
-            return false;   // Never late if not inside this status range
+        if (!($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
+            return false; // Never late if not inside this status range
         }
 
         $now = dol_now();
@@ -3716,9 +3716,9 @@ 
     {
         global $conf, $langs;
 
-        if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
-        $text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+        if (empty($this->date_livraison)) $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+        else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+        $text .= ' '.($conf->commande->client->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->client->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
         return $text;
     }
@@ -3730,8 +3730,8 @@ 
  */
 class OrderLine extends CommonOrderLine
 {
-	public $element='commandedet';
-	public $table_element='commandedet';
+	public $element = 'commandedet';
+	public $table_element = 'commandedet';
 
     var $oldline;
 
@@ -3786,7 +3786,7 @@ 
      */
     function __construct($db)
     {
-        $this->db= $db;
+        $this->db = $db;
     }
 
     /**
@@ -3798,15 +3798,15 @@ 
     function fetch($rowid)
     {
         $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
-        $sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
-        $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
-	    $sql.= ' cd.fk_unit,';
-		$sql.= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
-        $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
-        $sql.= ' cd.date_start, cd.date_end';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
-        $sql.= ' WHERE cd.rowid = '.$rowid;
+        $sql .= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
+        $sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
+	    $sql .= ' cd.fk_unit,';
+		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
+        $sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
+        $sql .= ' cd.date_start, cd.date_end';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+        $sql .= ' WHERE cd.rowid = '.$rowid;
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -3829,24 +3829,24 @@ 
             $this->fk_product       = $objp->fk_product;
             $this->product_type     = $objp->product_type;
             $this->info_bits        = $objp->info_bits;
-			$this->special_code		= $objp->special_code;
+			$this->special_code = $objp->special_code;
             $this->total_ht         = $objp->total_ht;
             $this->total_tva        = $objp->total_tva;
             $this->total_localtax1  = $objp->total_localtax1;
             $this->total_localtax2  = $objp->total_localtax2;
             $this->total_ttc        = $objp->total_ttc;
-			$this->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];
 			$this->marge_tx			= $marginInfos[1];
 			$this->marque_tx		= $marginInfos[2];
-            $this->special_code		= $objp->special_code;
-            $this->rang             = $objp->rang;
+            $this->special_code = $objp->special_code;
+            $this->rang = $objp->rang;
 
-            $this->ref				= $objp->product_ref;      // deprecated
-            $this->product_ref		= $objp->product_ref;
-            $this->libelle			= $objp->product_libelle;  // deprecated
-            $this->product_label	= $objp->product_libelle;
+            $this->ref = $objp->product_ref; // deprecated
+            $this->product_ref = $objp->product_ref;
+            $this->libelle = $objp->product_libelle; // deprecated
+            $this->product_label = $objp->product_libelle;
             $this->product_desc     = $objp->product_desc;
             $this->product_tobatch  = $objp->product_tobatch;
             $this->fk_unit          = $objp->fk_unit;
@@ -3854,8 +3854,8 @@ 
             $this->date_start       = $this->db->jdate($objp->date_start);
             $this->date_end         = $this->db->jdate($objp->date_end);
 
-			$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;
@@ -3879,25 +3879,25 @@ 
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
      *	@return	 int  <0 si ko, >0 si ok
      */
-    function delete($user=null, $notrigger=0)
+    function delete($user = null, $notrigger = 0)
     {
         global $conf, $user, $langs;
 
-		$error=0;
+		$error = 0;
 
 	    $this->db->begin();
 
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
 
         dol_syslog("OrderLine::delete", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 			// 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++;
@@ -3905,10 +3905,10 @@ 
 				}
 			}
 
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('LINEORDER_DELETE',$user);
+	            $result = $this->call_trigger('LINEORDER_DELETE', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
@@ -3918,17 +3918,17 @@ 
 		        return 1;
 	        }
 
-	        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
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -3940,31 +3940,31 @@ 
      *	@param      int		$notrigger		1 = disable triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-    function insert($user=null, $notrigger=0)
+    function insert($user = null, $notrigger = 0)
     {
         global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->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->pa_ht)) $this->pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -3986,73 +3986,73 @@ 
 
         // Insertion dans base de la ligne
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
-        $sql.= ' (fk_commande, fk_parent_line, label, description, qty, ';
-        $sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
-        $sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
-        $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
-	    $sql.= ' fk_unit';
-		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ')';
-        $sql.= " VALUES (".$this->fk_commande.",";
-        $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.= " '".price2num($this->qty)."',";
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $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->fk_product)?$this->fk_product:"null").',';
-        $sql.= " '".$this->db->escape($this->product_type)."',";
-        $sql.= " '".price2num($this->remise_percent)."',";
-        $sql.= " ".($this->subprice!=''?"'".price2num($this->subprice)."'":"null").",";
-        $sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").",";
-        $sql.= " '".price2num($this->remise)."',";
-        $sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
-        $sql.= ' '.$this->special_code.',';
-        $sql.= ' '.$this->rang.',';
-		$sql.= ' '.(! empty($this->fk_fournprice)?$this->fk_fournprice:"null").',';
-		$sql.= ' '.price2num($this->pa_ht).',';
-        $sql.= " '".$this->db->escape($this->info_bits)."',";
-        $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->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
-        $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
-	    $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= ", ".$this->fk_multicurrency;
-		$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.= ')';
+        $sql .= ' (fk_commande, fk_parent_line, label, description, qty, ';
+        $sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+        $sql .= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
+        $sql .= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
+        $sql .= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
+	    $sql .= ' fk_unit';
+		$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ')';
+        $sql .= " VALUES (".$this->fk_commande.",";
+        $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 .= " '".price2num($this->qty)."',";
+        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+        $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->fk_product) ? $this->fk_product : "null").',';
+        $sql .= " '".$this->db->escape($this->product_type)."',";
+        $sql .= " '".price2num($this->remise_percent)."',";
+        $sql .= " ".($this->subprice != '' ? "'".price2num($this->subprice)."'" : "null").",";
+        $sql .= " ".($this->price != '' ? "'".price2num($this->price)."'" : "null").",";
+        $sql .= " '".price2num($this->remise)."',";
+        $sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
+        $sql .= ' '.$this->special_code.',';
+        $sql .= ' '.$this->rang.',';
+		$sql .= ' '.(!empty($this->fk_fournprice) ? $this->fk_fournprice : "null").',';
+		$sql .= ' '.price2num($this->pa_ht).',';
+        $sql .= " '".$this->db->escape($this->info_bits)."',";
+        $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->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").',';
+        $sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").',';
+	    $sql .= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= ", ".$this->fk_multicurrency;
+		$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 .= ')';
 
         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.'commandedet');
+            $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
 
 			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 (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
 	            // Call trigger
-	            $result=$this->call_trigger('LINEORDER_INSERT',$user);
+	            $result = $this->call_trigger('LINEORDER_INSERT', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
             }
@@ -4062,17 +4062,17 @@ 
 		        return 1;
 	        }
 
-	        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
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -4085,32 +4085,32 @@ 
 	 *	@param      int		$notrigger		1 = disable triggers
      *	@return		int		<0 si ko, >0 si ok
      */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->localtax1_type)) $this->localtax1_type=0;
-		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-		if (empty($this->qty)) $this->qty=0;
-		if (empty($this->total_localtax1)) $this->total_localtax1=0;
-		if (empty($this->total_localtax2)) $this->total_localtax2=0;
-		if (empty($this->marque_tx)) $this->marque_tx=0;
-		if (empty($this->marge_tx)) $this->marge_tx=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->product_type)) $this->product_type=0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line=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->qty)) $this->qty = 0;
+		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->marque_tx)) $this->marque_tx = 0;
+		if (empty($this->marge_tx)) $this->marge_tx = 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->product_type)) $this->product_type = 0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line = 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 && $pa_ht_isemptystring)
@@ -4129,64 +4129,64 @@ 
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
-		$sql.= " description='".$this->db->escape($this->desc)."'";
-		$sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-		$sql.= " , vat_src_code=".(! empty($this->vat_src_code)?"'".$this->db->escape($this->vat_src_code)."'":"''");
-		$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 .= " description='".$this->db->escape($this->desc)."'";
+		$sql .= " , label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= " , vat_src_code=".(!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : "''");
+		$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
 		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->fk_fournprice:"null");
-		$sql.= " , buy_price_ht='".price2num($this->pa_ht)."'";
-		$sql.= " , info_bits=".$this->info_bits;
-        $sql.= " , special_code=".$this->special_code;
-		$sql.= " , date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-		$sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= " , product_type=".$this->product_type;
-		$sql.= " , fk_parent_line=".(! empty($this->fk_parent_line)?$this->fk_parent_line:"null");
-		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
-		$sql.= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? $this->fk_fournprice : "null");
+		$sql .= " , buy_price_ht='".price2num($this->pa_ht)."'";
+		$sql .= " , info_bits=".$this->info_bits;
+        $sql .= " , special_code=".$this->special_code;
+		$sql .= " , date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+		$sql .= " , date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= " , product_type=".$this->product_type;
+		$sql .= " , fk_parent_line=".(!empty($this->fk_parent_line) ? $this->fk_parent_line : "null");
+		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		$sql .= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
 		// 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('LINEORDER_UPDATE',$user);
+	            $result = $this->call_trigger('LINEORDER_UPDATE', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
@@ -4196,17 +4196,17 @@ 
 				return 1;
 			}
 
-			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
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4222,21 +4222,21 @@ 
         $this->db->begin();
 
         // Clean parameters
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
-        $sql.= " total_ht='".price2num($this->total_ht)."'";
-        $sql.= ",total_tva='".price2num($this->total_tva)."'";
-        $sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= " WHERE rowid = ".$this->rowid;
+        $sql .= " total_ht='".price2num($this->total_ht)."'";
+        $sql .= ",total_tva='".price2num($this->total_tva)."'";
+        $sql .= ",total_localtax1='".price2num($this->total_localtax1)."'";
+        $sql .= ",total_localtax2='".price2num($this->total_localtax2)."'";
+        $sql .= ",total_ttc='".price2num($this->total_ttc)."'";
+        $sql .= " WHERE rowid = ".$this->rowid;
 
         dol_syslog("OrderLine::update_total", LOG_DEBUG);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -4244,7 +4244,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }

Braces +649 added lines, -345 removed lines

@@ -238,15 +238,13 @@ 
             if ($numref != "")
             {
             	return $numref;
-            }
-            else
+            } else
 			{
 				$this->error=$obj->error;
             	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
             	return "";
             }
-        }
-        else
+        } else
         {
             print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
             return "";
@@ -296,11 +294,12 @@ 
         $result=$soc->set_as_client();
 
         // 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;
         }
@@ -347,7 +346,9 @@ 
                         	$this->error=$mouvP->error;
                         }
                     }
-                    if ($error) break;
+                    if ($error) {
+                    	break;
+                    }
                 }
             }
         }
@@ -356,7 +357,9 @@ 
         {
             // Call trigger
             $result=$this->call_trigger('ORDER_VALIDATE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
         }
 
@@ -406,8 +409,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
 		{
             $this->db->rollback();
             return -1;
@@ -474,19 +476,20 @@ 
             if (!$error) {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_UNVALIDATE',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             }
 
             if (!$error) {
            		$this->statut=self::STATUS_DRAFT;
             	$this->db->commit();
             	return 1;
-            }else {
+            } else {
             	$this->db->rollback();
             	return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -524,10 +527,11 @@ 
         {
             // Call trigger
             $result=$this->call_trigger('ORDER_REOPEN',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
-        }
-        else
+        } else
         {
             $error++;
             $this->error=$this->db->lasterror();
@@ -542,8 +546,7 @@ 
 
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
 	        foreach($this->errors as $errmsg)
 	        {
@@ -584,7 +587,9 @@ 
             {
 	            // Call trigger
 	            $result=$this->call_trigger('ORDER_CLOSE',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 
                 if (! $error)
@@ -593,14 +598,12 @@ 
 
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$this->db->lasterror();
 
@@ -661,7 +664,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('ORDER_CANCEL',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 
@@ -670,8 +675,7 @@ 
 				$this->statut=self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				foreach($this->errors as $errmsg)
 				{
@@ -681,8 +685,7 @@ 
 				$this->db->rollback();
 				return -1*$error;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -710,8 +713,11 @@ 
         $date = ($this->date_commande ? $this->date_commande : $this->date);
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -722,9 +728,12 @@ 
         dol_syslog(get_class($this)."::create user=".$user->id);
 
         // 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';
@@ -814,7 +823,9 @@ 
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+                	if (! is_object($line)) {
+                		$line = (object) $line;
+                	}
 
                     // Reset fk_parent_line for no child products and special product
                     if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
@@ -866,7 +877,9 @@ 
 
                 // update ref
                 $initialref='(PROV'.$this->id.')';
-                if (! empty($this->ref)) $initialref=$this->ref;
+                if (! empty($this->ref)) {
+                	$initialref=$this->ref;
+                }
 
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
                 if ($this->db->query($sql))
@@ -880,19 +893,20 @@ 
                         {
                         	foreach($this->linked_objects as $origin => $tmp_origin_id)
                         	{
-                        	    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+                        	    if (is_array($tmp_origin_id)) {
+                        	    	// New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
                         	    {
                         	        foreach($tmp_origin_id as $origin_id)
                         	        {
                         	            $ret = $this->add_object_linked($origin, $origin_id);
+                        	    }
                         	            if (! $ret)
                         	            {
                         	                dol_print_error($this->db);
                         	                $error++;
                         	            }
                         	        }
-                        	    }
-                        	    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+                        	    } else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
                         	    {
                         	        $origin_id = $tmp_origin_id;
                         	        $ret = $this->add_object_linked($origin, $origin_id);
@@ -905,13 +919,17 @@ 
                         	}
                         }
 
-            			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+            			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id)) {
+            				// Get contact from origin object
             			{
             				$originforcontact = $this->origin;
+            			}
             				$originidforcontact = $this->origin_id;
-                		    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+                		    if ($originforcontact == 'shipping') {
+                		    	// shipment and order share the same contacts. If creating from shipment we take data of order
                 		    {
                 		        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+                		    }
                 		        $exp = new Expedition($db);
                 		        $exp->fetch($this->origin_id);
                 		        $exp->fetchObjectLinked();
@@ -920,8 +938,11 @@ 
                 		            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
                 		            {
                 		                $originforcontact = 'commande';
-							            if (is_object($value)) $originidforcontact = $value->id;
-							            else $originidforcontact = $value;
+							            if (is_object($value)) {
+							            	$originidforcontact = $value->id;
+							            } else {
+							            	$originidforcontact = $value;
+							            }
                 		                break; // We take first one
                 		            }
                 		        }
@@ -938,22 +959,27 @@ 
         					        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
                 		            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
                 		        }
+                		    } else {
+                		    	dol_print_error($resqlcontact);
                 		    }
-                		    else dol_print_error($resqlcontact);
                 		}
                     }
 
                     if (! $error)
                     {
                    		$result=$this->insertExtraFields();
-                   		if ($result < 0) $error++;
+                   		if ($result < 0) {
+                   			$error++;
+                   		}
                     }
 
                     if (! $error && ! $notrigger)
                     {
 			            // Call trigger
 			            $result=$this->call_trigger('ORDER_CREATE',$user);
-			            if ($result < 0) $error++;
+			            if ($result < 0) {
+			            	$error++;
+			            }
 			            // End call triggers
                     }
 
@@ -961,22 +987,19 @@ 
 	                {
 		                $this->db->commit();
 		                return $this->id;
-	                }
-	                else
+	                } else
 					{
 	                	$this->db->rollback();
 	                	return -1*$error;
 					}
-                }
-                else
+                } else
 				{
 					$this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
             }
-        }
-        else
+        } else
 		{
             dol_print_error($this->db);
             $this->db->rollback();
@@ -1002,8 +1025,9 @@ 
         $this->db->begin();
 
 		// get lines 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;
@@ -1040,7 +1064,9 @@ 
 
         // Create clone
         $result=$this->create($user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+        	$error++;
+        }
 
         if (! $error)
         {
@@ -1050,12 +1076,16 @@ 
                 $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
             $result=$this->call_trigger('ORDER_CLONE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
         }
 
@@ -1066,8 +1096,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1129,8 +1158,9 @@ 
 
             // get extrafields from original line
 			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
-			foreach($object->lines[$i]->array_options as $options_key => $value)
-				$line->array_options[$options_key] = $value;
+			foreach($object->lines[$i]->array_options as $options_key => $value) {
+							$line->array_options[$options_key] = $value;
+			}
 
 			$this->lines[$i] = $line;
         }
@@ -1182,7 +1212,9 @@ 
             $parameters=array('objFrom'=>$object);
             $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++;
+            }
 
             if (! $error)
             {
@@ -1193,10 +1225,12 @@ 
                     $this->valid($user);
                 }
                 return $ret;
+            } else {
+            	return -1;
             }
-            else return -1;
+        } else {
+        	return -1;
         }
-        else return -1;
     }
 
 
@@ -1247,15 +1281,33 @@ 
         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($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-        if (empty($this->fk_multicurrency)) $this->fk_multicurrency=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($txtva)) {
+        	$txtva=0;
+        }
+        if (empty($txlocaltax1)) {
+        	$txlocaltax1=0;
+        }
+        if (empty($txlocaltax2)) {
+        	$txlocaltax2=0;
+        }
+        if (empty($fk_parent_line) || $fk_parent_line < 0) {
+        	$fk_parent_line=0;
+        }
+        if (empty($this->fk_multicurrency)) {
+        	$this->fk_multicurrency=0;
+        }
 
         $remise_percent=price2num($remise_percent);
         $qty=price2num($qty);
@@ -1268,8 +1320,7 @@ 
         if ($price_base_type=='HT')
         {
             $pu=$pu_ht;
-        }
-        else
+        } else
         {
             $pu=$pu_ttc;
         }
@@ -1277,7 +1328,9 @@ 
         $desc=trim($desc);
 
         // Check parameters
-        if ($type < 0) return -1;
+        if ($type < 0) {
+        	return -1;
+        }
 
         if ($this->statut == self::STATUS_DRAFT)
         {
@@ -1408,7 +1461,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 commande meme
                 $result=$this->update_price(1,'auto',0,$mysoc);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -1416,22 +1471,19 @@ 
                 {
                     $this->db->commit();
                     return $this->line->rowid;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$this->line->error;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
             return -3;
@@ -1457,7 +1509,9 @@ 
     {
         global $conf, $mysoc;
 
-        if (! $qty) $qty = 1;
+        if (! $qty) {
+        	$qty = 1;
+        }
 
         if ($idproduct > 0)
         {
@@ -1466,17 +1520,20 @@ 
 
             $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;
+            }
             $vat_src_code = '';     // May be defined into tva_tx
 
             $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
             $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
 
             // multiprix
-            if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
-            $price = $prod->multiprices[$this->thirdparty->price_level];
-            else
-            $price = $prod->price;
+            if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
+                        $price = $prod->multiprices[$this->thirdparty->price_level];
+            } else {
+                        $price = $prod->price;
+            }
 
             $line=new OrderLine($this->db);
 
@@ -1540,7 +1597,9 @@ 
     {
 
         // Check parameters
-        if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+        if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) {
+        	return -1;
+        }
 
         $sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
         $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
@@ -1565,10 +1624,18 @@ 
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
         $sql.= " WHERE c.entity IN (".getEntity('commande').")";
-        if ($id)   	  $sql.= " AND c.rowid=".$id;
-        if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
+        if ($id) {
+        	$sql.= " AND c.rowid=".$id;
+        }
+        if ($ref) {
+        	$sql.= " AND c.ref='".$this->db->escape($ref)."'";
+        }
+        if ($ref_ext) {
+        	$sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
+        }
+        if ($ref_int) {
+        	$sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -1640,7 +1707,9 @@ 
 
                 $this->lines				= array();
 
-                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+                if ($this->statut == self::STATUS_DRAFT) {
+                	$this->brouillon = 1;
+                }
 
                 // Retrieve all extrafields for invoice
                 // fetch optionals attributes and labels
@@ -1660,14 +1729,12 @@ 
                     return -3;
                 }
                 return 1;
-            }
-            else
+            } else
             {
                 $this->error='Order with id '.$id.' not found sql='.$sql;
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -1695,9 +1762,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;
             }
@@ -1730,21 +1799,18 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -2;
@@ -1772,7 +1838,9 @@ 
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
         $sql.= ' WHERE l.fk_commande = '.$this->id;
-        if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+        if ($only_product) {
+        	$sql .= ' AND p.fk_product_type = 0';
+        }
         $sql .= ' ORDER BY l.rang, l.rowid';
 
         dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -1857,8 +1925,7 @@ 
             $this->db->free($result);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -1876,7 +1943,9 @@ 
         $nb=0;
         foreach($this->lines as $line)
         {
-            if ($line->product_type == 0) $nb++;
+            if ($line->product_type == 0) {
+            	$nb++;
+            }
         }
         return $nb;
     }
@@ -1891,7 +1960,9 @@ 
         $nb=0;
         foreach($this->lines as $line)
         {
-            if ($line->product_type == 1) $nb++;
+            if ($line->product_type == 1) {
+            	$nb++;
+            }
         }
         return $nb;
     }
@@ -1910,14 +1981,22 @@ 
         $sql = 'SELECT cd.rowid, cd.fk_product,';
         $sql.= ' sum(ed.qty) as qty';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
-        if ($filtre_statut >= 0) $sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
+        if ($filtre_statut >= 0) {
+        	$sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
+        }
         $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
         $sql.= ' WHERE';
-        if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
+        if ($filtre_statut >= 0) {
+        	$sql.= ' ed.fk_expedition = e.rowid AND';
+        }
         $sql.= ' ed.fk_origin_line = cd.rowid';
         $sql.= ' AND cd.fk_commande =' .$this->id;
-        if ($this->fk_product > 0) $sql.= ' AND cd.fk_product = '.$this->fk_product;
-        if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
+        if ($this->fk_product > 0) {
+        	$sql.= ' AND cd.fk_product = '.$this->fk_product;
+        }
+        if ($filtre_statut >= 0) {
+        	$sql.=' AND e.fk_statut >= '.$filtre_statut;
+        }
         $sql.= ' GROUP BY cd.rowid, cd.fk_product';
         //print $sql;
 
@@ -1935,8 +2014,7 @@ 
             }
             $this->db->free();
             return $num;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;
@@ -1965,8 +2043,9 @@ 
         {
             $row = $this->db->fetch_row($resql);
             return $row[0];
+        } else {
+        	dol_print_error($this->db);
         }
-        else dol_print_error($this->db);
     }
 
     /**
@@ -2051,35 +2130,30 @@ 
                         {
                             $this->db->commit();
                             return 1;
-                        }
-                        else
+                        } else
                         {
                             $this->db->rollback();
                             $this->error=$this->db->lasterror();
                             return -1;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->db->rollback();
                         $this->error=$line->error;
                         return -1;
                     }
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return 0;
                 }
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 $this->error=$this->db->lasterror();
                 return -1;
             }
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -2128,7 +2202,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2136,8 +2212,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2194,7 +2269,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2202,8 +2279,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2255,7 +2331,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2263,8 +2341,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2274,8 +2351,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -2319,7 +2395,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2327,8 +2405,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2338,8 +2415,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -2366,18 +2442,30 @@ 
 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
         $sql.= " c.rowid as cid, c.ref";
-        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."commande 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 c.entity IN (".getEntity('commande').")";
         $sql.= " AND c.fk_soc = s.rowid";
-        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 c.fk_statut = ".self::STATUS_DRAFT;
-        if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
+        }
+        if ($socid) {
+        	$sql.= " AND s.rowid = ".$socid;
+        }
+        if ($draft) {
+        	$sql.= " AND c.fk_statut = ".self::STATUS_DRAFT;
+        }
+        if (is_object($excluser)) {
+        	$sql.= " AND c.fk_user_author <> ".$excluser->id;
+        }
         $sql.= $this->db->order($sortfield,$sortorder);
         $sql.= $this->db->plimit($limit,$offset);
 
@@ -2395,12 +2483,10 @@ 
                     if ($shortlist == 1)
                     {
                     	$ga[$obj->cid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
+                    } else if ($shortlist == 2)
                     {
                     	$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
+                    } else
 					{
                     	$ga[$i]['id']	= $obj->cid;
                     	$ga[$i]['ref'] 	= $obj->ref;
@@ -2410,8 +2496,7 @@ 
                 }
             }
             return $ga;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return -1;
@@ -2458,7 +2543,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2466,8 +2553,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2477,8 +2563,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
         	$error_str='Command status do not meet requirement '.$this->statut;
             dol_syslog(__METHOD__.$error_str, LOG_ERR);
@@ -2528,7 +2613,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2536,8 +2623,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2547,8 +2633,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
         	$error_str='order status do not meet requirement '.$this->statut;
         	dol_syslog(__METHOD__.$error_str, LOG_ERR);
@@ -2596,15 +2681,16 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
             if (! $error)
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2614,8 +2700,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -2652,7 +2737,9 @@ 
 			{
             	// Call trigger
             	$result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
 			}
 
@@ -2660,8 +2747,7 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				foreach($this->errors as $errmsg)
 				{
@@ -2671,8 +2757,7 @@ 
 				$this->db->rollback();
 				return -1*$error;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
             $this->db->rollback();
@@ -2722,7 +2807,9 @@ 
 
 	        // Call trigger
 	        $result=$this->call_trigger('ORDER_CLASSIFY_UNBILLED',$user);
-	        if ($result < 0) $error++;
+	        if ($result < 0) {
+	        	$error++;
+	        }
 	        // End call triggers
 
 	        if (! $error)
@@ -2732,8 +2819,7 @@ 
 
 	            $this->db->commit();
 	            return 1;
-	        }
-	        else
+	        } else
 	        {
 	            foreach($this->errors as $errmsg)
 	            {
@@ -2743,8 +2829,7 @@ 
 	            $this->db->rollback();
 	            return -1*$error;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->error=$this->db->error();
 	        $this->db->rollback();
@@ -2793,14 +2878,30 @@ 
             $this->db->begin();
 
             // Clean parameters
-            if (empty($qty)) $qty=0;
-            if (empty($info_bits)) $info_bits=0;
-            if (empty($txtva)) $txtva=0;
-            if (empty($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2)) $txlocaltax2=0;
-            if (empty($remise)) $remise=0;
-            if (empty($remise_percent)) $remise_percent=0;
-            if (empty($special_code) || $special_code == 3) $special_code=0;
+            if (empty($qty)) {
+            	$qty=0;
+            }
+            if (empty($info_bits)) {
+            	$info_bits=0;
+            }
+            if (empty($txtva)) {
+            	$txtva=0;
+            }
+            if (empty($txlocaltax1)) {
+            	$txlocaltax1=0;
+            }
+            if (empty($txlocaltax2)) {
+            	$txlocaltax2=0;
+            }
+            if (empty($remise)) {
+            	$remise=0;
+            }
+            if (empty($remise_percent)) {
+            	$remise_percent=0;
+            }
+            if (empty($special_code) || $special_code == 3) {
+            	$special_code=0;
+            }
 
             $remise_percent=price2num($remise_percent);
             $qty=price2num($qty);
@@ -2847,8 +2948,7 @@ 
 			if ($price_base_type == 'TTC')
 			{
 				$subprice = $pu_ttc;
-			}
-			else
+			} else
 			{
 				$subprice = $pu_ht;
 			}
@@ -2940,23 +3040,23 @@ 
             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 info denormalisees
                 $this->update_price(1);
 
                 $this->db->commit();
                 return $result;
-            }
-            else
+            } else
             {
 	            $this->error=$this->line->error;
 
 	            $this->db->rollback();
 	            return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::updateline Order status makes operation forbidden";
         	$this->errors=array('OrderStatusMakeOperationForbidden');
@@ -2976,12 +3076,24 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client=trim($this->ref_client);
-		if (isset($this->note) || isset($this->note_private)) $this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->ref)) {
+			$this->ref=trim($this->ref);
+		}
+		if (isset($this->ref_client)) {
+			$this->ref_client=trim($this->ref_client);
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		}
+		if (isset($this->note_public)) {
+			$this->note_public=trim($this->note_public);
+		}
+		if (isset($this->modelpdf)) {
+			$this->modelpdf=trim($this->modelpdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key=trim($this->import_key);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -3027,7 +3139,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('ORDER_MODIFY',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 		}
@@ -3042,8 +3156,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -3070,22 +3183,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;
     	}
@@ -3114,7 +3229,9 @@ 
         {
             // Call trigger
             $result=$this->call_trigger('ORDER_DELETE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
         }
 
@@ -3139,16 +3256,22 @@ 
 
         	// Delete linked object
         	$res = $this->deleteObjectLinked();
-        	if ($res < 0) $error++;
+        	if ($res < 0) {
+        		$error++;
+        	}
 
         	// Delete linked contacts
         	$res = $this->delete_linked_contact();
-        	if ($res < 0) $error++;
+        	if ($res < 0) {
+        		$error++;
+        	}
 
         	// 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
         	{
         		$result=$this->deleteExtraFields();
+        	}
         		if ($result < 0)
         		{
         			$error++;
@@ -3162,13 +3285,17 @@ 
         	{
         		$dir = $conf->commande->dir_output . "/" . $comref ;
         		$file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
-        		if (file_exists($file))	// We must delete all files before deleting directory
+        		if (file_exists($file)) {
+        			// We must delete all files before deleting directory
         		{
         			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->db->rollback();
+        			}
         				return 0;
         			}
         		}
@@ -3190,8 +3317,7 @@ 
         {
         	$this->db->commit();
         	return 1;
-        }
-        else
+        } else
         {
 	        foreach($this->errors as $errmsg)
 	        {
@@ -3226,7 +3352,9 @@ 
         $sql.= $clause." c.entity IN (".getEntity('commande').")";
         //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
         $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+        if ($user->societe_id) {
+        	$sql.=" AND c.fk_soc = ".$user->societe_id;
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -3253,8 +3381,7 @@ 
             }
 
             return $response;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -3272,7 +3399,9 @@ 
 
         $label=$langs->trans('OrderSource'.$this->source);
 
-        if ($label == 'OrderSource') return '';
+        if ($label == 'OrderSource') {
+        	return '';
+        }
         return $label;
     }
 
@@ -3284,7 +3413,10 @@ 
      */
     function getLibStatut($mode)
     {
-        if ($this->facturee && empty($this->billed)) $this->billed=$this->facturee; // For backward compatibility
+        if ($this->facturee && empty($this->billed)) {
+        	$this->billed=$this->facturee;
+        }
+        // For backward compatibility
         return $this->LibStatut($this->statut,$this->billed,$mode);
     }
 
@@ -3302,68 +3434,149 @@ 
         global $langs, $conf;
 
         $billedtext = '';
-        if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
+        if (empty($donotshowbilled)) {
+        	$billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
+        }
 
         //print 'x'.$statut.'-'.$billed;
         if ($mode == 0)
         {
-            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
-            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
-            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
-        }
-        elseif ($mode == 1)
+            if ($statut==self::STATUS_CANCELED) {
+            	return $langs->trans('StatusOrderCanceled');
+            }
+            if ($statut==self::STATUS_DRAFT) {
+            	return $langs->trans('StatusOrderDraft');
+            }
+            if ($statut==self::STATUS_VALIDATED) {
+            	return $langs->trans('StatusOrderValidated').$billedtext;
+            }
+            if ($statut==self::STATUS_ACCEPTED) {
+            	return $langs->trans('StatusOrderSentShort').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return $langs->trans('StatusOrderToBill');
+            }
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return $langs->trans('StatusOrderProcessed').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return $langs->trans('StatusOrderDelivered');
+            }
+        } elseif ($mode == 1)
         {
-            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
-            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
-            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
-        }
-        elseif ($mode == 2)
+            if ($statut==self::STATUS_CANCELED) {
+            	return $langs->trans('StatusOrderCanceledShort');
+            }
+            if ($statut==self::STATUS_DRAFT) {
+            	return $langs->trans('StatusOrderDraftShort');
+            }
+            if ($statut==self::STATUS_VALIDATED) {
+            	return $langs->trans('StatusOrderValidatedShort').$billedtext;
+            }
+            if ($statut==self::STATUS_ACCEPTED) {
+            	return $langs->trans('StatusOrderSentShort').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return $langs->trans('StatusOrderToBillShort');
+            }
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return $langs->trans('StatusOrderProcessed').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return $langs->trans('StatusOrderDelivered');
+            }
+        } elseif ($mode == 2)
         {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
-        }
-        elseif ($mode == 3)
+            if ($statut==self::STATUS_CANCELED) {
+            	return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
+            }
+            if ($statut==self::STATUS_DRAFT) {
+            	return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
+            }
+            if ($statut==self::STATUS_VALIDATED) {
+            	return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
+            }
+            if ($statut==self::STATUS_ACCEPTED) {
+            	return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
+            }
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
+            }
+        } elseif ($mode == 3)
         {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
-        }
-        elseif ($mode == 4)
+            if ($statut==self::STATUS_CANCELED) {
+            	return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+            }
+            if ($statut==self::STATUS_DRAFT) {
+            	return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+            }
+            if ($statut==self::STATUS_VALIDATED) {
+            	return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+            }
+            if ($statut==self::STATUS_ACCEPTED) {
+            	return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
+            }
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderToBill'),'statut4');
+            }
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+            }
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+            }
+        } elseif ($mode == 4)
         {
-            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
-            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
-            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
-            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
-        }
-        elseif ($mode == 5)
+            if ($statut==self::STATUS_CANCELED) {
+            	return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
+            }
+            if ($statut==self::STATUS_DRAFT) {
+            	return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
+            }
+            if ($statut==self::STATUS_VALIDATED) {
+            	return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
+            }
+            if ($statut==self::STATUS_ACCEPTED) {
+            	return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
+            }
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+            }
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
+            }
+        } elseif ($mode == 5)
         {
-            if ($statut==self::STATUS_CANCELED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderCanceledShort').' </span>'.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==self::STATUS_DRAFT) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
-            if ($statut==self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
-            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut4');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+            if ($statut==self::STATUS_CANCELED) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderCanceledShort').' </span>'.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+            }
+            if ($statut==self::STATUS_DRAFT) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'),'statut0');
+            }
+            if ($statut==self::STATUS_VALIDATED) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+            }
+            if ($statut==self::STATUS_ACCEPTED) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
+            }
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut4');
+            }
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+            }
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+            	return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+            }
         }
     }
 
@@ -3383,22 +3596,34 @@ 
     {
         global $conf, $langs, $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
 
         $result='';
 
-        if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
-        else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
+        if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) {
+        	$url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
+        } else {
+        	$url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
+        }
 
         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';
+            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 ($short) return $url;
+        if ($short) {
+        	return $url;
+        }
 
         $picto = 'order';
         $label = '';
@@ -3434,8 +3659,12 @@ 
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        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;
     }
@@ -3491,8 +3720,7 @@ 
 
             $this->db->free($result);
 
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -3562,8 +3790,7 @@ 
                 $line->total_ttc=60;
                 $line->total_tva=10;
                 $line->remise_percent=50;
-            }
-            else
+            } else
             {
                 $line->total_ht=100;
                 $line->total_ttc=120;
@@ -3620,8 +3847,7 @@ 
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->error();
@@ -3716,8 +3942,11 @@ 
     {
         global $conf, $langs;
 
-        if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+        if (empty($this->date_livraison)) {
+        	$text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+        } else {
+        	$text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+        }
         $text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
         return $text;
@@ -3864,8 +4093,7 @@ 
             $this->db->free($result);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -3894,9 +4122,11 @@ 
         if ($resql)
         {
 			// 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)
 				{
@@ -3909,7 +4139,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('LINEORDER_DELETE',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 
@@ -3925,8 +4157,7 @@ 
 	        }
 	        $this->db->rollback();
 	        return -1*$error;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;
@@ -3951,20 +4182,48 @@ 
         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->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->pa_ht)) {
+			$this->pa_ht=0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -3972,15 +4231,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();
 
@@ -4039,9 +4299,11 @@ 
         {
             $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
 
-			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)
 				{
@@ -4053,7 +4315,9 @@ 
             {
 	            // Call trigger
 	            $result=$this->call_trigger('LINEORDER_INSERT',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
             }
 
@@ -4069,8 +4333,7 @@ 
 	        }
 	        $this->db->rollback();
 	        return -1*$error;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -4094,23 +4357,57 @@ 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '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->localtax1_type)) $this->localtax1_type=0;
-		if (empty($this->localtax2_type)) $this->localtax2_type=0;
-		if (empty($this->qty)) $this->qty=0;
-		if (empty($this->total_localtax1)) $this->total_localtax1=0;
-		if (empty($this->total_localtax2)) $this->total_localtax2=0;
-		if (empty($this->marque_tx)) $this->marque_tx=0;
-		if (empty($this->marge_tx)) $this->marge_tx=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->product_type)) $this->product_type=0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line=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->qty)) {
+			$this->qty=0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1=0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2=0;
+		}
+		if (empty($this->marque_tx)) {
+			$this->marque_tx=0;
+		}
+		if (empty($this->marge_tx)) {
+			$this->marge_tx=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->product_type)) {
+			$this->product_type=0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line=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 && $pa_ht_isemptystring)
@@ -4118,8 +4415,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -4158,7 +4454,9 @@ 
 		$sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
 		$sql.= " , product_type=".$this->product_type;
 		$sql.= " , fk_parent_line=".(! empty($this->fk_parent_line)?$this->fk_parent_line:"null");
-		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
+		if (! empty($this->rang)) {
+			$sql.= ", rang=".$this->rang;
+		}
 		$sql.= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
 		// Multicurrency
@@ -4173,9 +4471,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)
 				{
@@ -4187,7 +4487,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('LINEORDER_UPDATE',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 
@@ -4203,8 +4505,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4222,8 +4523,12 @@ 
         $this->db->begin();
 
         // Clean parameters
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
+        if (empty($this->total_localtax1)) {
+        	$this->total_localtax1=0;
+        }
+        if (empty($this->total_localtax2)) {
+        	$this->total_localtax2=0;
+        }
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
@@ -4241,8 +4546,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();

htdocs/compta/facture/class/facture.class.php

Doc Comments +11 added lines, -11 removed lines

@@ -2408,17 +2408,17 @@ 
 	 * 		@param    	double		$pu_ht              Unit price without tax (> 0 even for credit note)
 	 * 		@param    	double		$qty             	Quantity
 	 * 		@param    	double		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
-	 * 		@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
-	 *  	@param		double		$txlocaltax2		Local tax 2 rate (deprecated)
+	 * 		@param		integer		$txlocaltax1		Local tax 1 rate (deprecated)
+	 *  	@param		integer		$txlocaltax2		Local tax 2 rate (deprecated)
 	 *		@param    	int			$fk_product      	Id of predefined product/service
-	 * 		@param    	double		$remise_percent  	Percent of discount on line
+	 * 		@param    	integer		$remise_percent  	Percent of discount on line
 	 * 		@param    	int	$date_start      	Date start of service
 	 * 		@param    	int	$date_end        	Date end of service
 	 * 		@param    	int			$ventil          	Code of dispatching into accountancy
 	 * 		@param    	int			$info_bits			Bits de type de lignes
 	 *		@param    	int			$fk_remise_except	Id discount used
 	 *		@param		string		$price_base_type	'HT' or 'TTC'
-	 * 		@param    	double		$pu_ttc             Unit price with tax (> 0 even for credit note)
+	 * 		@param    	integer		$pu_ttc             Unit price with tax (> 0 even for credit note)
 	 * 		@param		int			$type				Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
 	 *      @param      int			$rang               Position of line
 	 *      @param		int			$special_code		Special code (also used by externals modules!)
@@ -2428,11 +2428,11 @@ 
 	 * 		@param		int			$fk_fournprice		Supplier price id (to calculate margin) or ''
 	 * 		@param		int			$pa_ht				Buying price of line (to calculate margin) or ''
 	 * 		@param		string		$label				Label of the line (deprecated, do not use)
-	 *		@param		array		$array_options		extrafields array
+	 *		@param		integer		$array_options		extrafields array
 	 *      @param      int         $situation_percent  Situation advance percentage
 	 *      @param      int         $fk_prev_id         Previous situation line id reference
 	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 		@param		double		$pu_ht_devise		Unit price in currency
+	 * 		@param		integer		$pu_ht_devise		Unit price in currency
 	 *    	@return    	int             				<0 if KO, Id of line if OK
 	 */
 	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id='', $fk_unit = null, $pu_ht_devise = 0)
@@ -2637,8 +2637,8 @@ 
 	 *  @param     	int		$date_start      	Date de debut de validite du service
 	 *  @param     	int		$date_end        	Date de fin de validite du service
 	 *  @param     	double		$txtva          	VAT Rate
-	 * 	@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		$price_base_type 	HT or TTC
 	 * 	@param     	int			$info_bits 		    Miscellaneous informations
 	 * 	@param		int			$type				Type of line (0=product, 1=service)
@@ -2648,10 +2648,10 @@ 
 	 * 	@param		int			$pa_ht				Price (without tax) of product when it was bought
 	 * 	@param		string		$label				Label of the line (deprecated, do not use)
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
-     *  @param		array		$array_options		extrafields array
+     *  @param		integer		$array_options		extrafields array
 	 * 	@param      int         $situation_percent  Situation advance percentage
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param		double		$pu_ht_devise		Unit price in currency
+	 * 	@param		integer		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
@@ -3525,7 +3525,7 @@ 
 	 *  Use the remain to pay excluding all existing open direct debit requests.
 	 *
 	 *	@param      User	$fuser      User asking the direct debit transfer
-	 *  @param		float	$amount		Amount we request direct debit for
+	 *  @param		integer	$amount		Amount we request direct debit for
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
 	function demande_prelevement($fuser, $amount=0)

Indentation +387 added lines, -387 removed lines

@@ -145,30 +145,30 @@ 
 
 	public $oldcopy;
 
-    /**
-     * Standard invoice
-     */
-    const TYPE_STANDARD = 0;
-
-    /**
-     * Replacement invoice
-     */
-    const TYPE_REPLACEMENT = 1;
-
-    /**
-     * Credit note invoice
-     */
-    const TYPE_CREDIT_NOTE = 2;
-
-    /**
-     * Deposit invoice
-     */
-    const TYPE_DEPOSIT = 3;
-
-    /**
-     * Proforma invoice (should not be used. a proforma is an order)
-     */
-    const TYPE_PROFORMA = 4;
+	/**
+	 * Standard invoice
+	 */
+	const TYPE_STANDARD = 0;
+
+	/**
+	 * Replacement invoice
+	 */
+	const TYPE_REPLACEMENT = 1;
+
+	/**
+	 * Credit note invoice
+	 */
+	const TYPE_CREDIT_NOTE = 2;
+
+	/**
+	 * Deposit invoice
+	 */
+	const TYPE_DEPOSIT = 3;
+
+	/**
+	 * Proforma invoice (should not be used. a proforma is an order)
+	 */
+	const TYPE_PROFORMA = 4;
 
 	/**
 	 * Situation invoice
@@ -242,7 +242,7 @@ 
 		if (! $this->cond_reglement_id) $this->cond_reglement_id = 0;
 		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
 		$this->brouillon = 1;
-        if (empty($this->entity)) $this->entity = $conf->entity;
+		if (empty($this->entity)) $this->entity = $conf->entity;
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
@@ -279,7 +279,7 @@ 
 		// Create invoice from a template invoice
 		if ($this->fac_rec > 0)
 		{
-		    $this->fk_fac_rec_source = $this->fac_rec;
+			$this->fk_fac_rec_source = $this->fac_rec;
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
@@ -315,9 +315,9 @@ 
 			$this->ref_client=trim($this->ref_client);
 			$this->note_public=trim($this->note_public);
 			$this->note_private=trim($this->note_private);
-		    $this->note_private=dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
+			$this->note_private=dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
 
-		    $this->array_options=$_facrec->array_options;
+			$this->array_options=$_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
 			if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
@@ -330,12 +330,12 @@ 
 			// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
 			if ($_facrec->frequency > 0)
 			{
-			    dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
-			    if (empty($_facrec->date_when)) $_facrec->date_when = $now;
-                $next_date = $_facrec->getNextDate();   // Calculate next date
-                $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
-                //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
-                $result = $_facrec->setNextDate($next_date,1);
+				dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
+				if (empty($_facrec->date_when)) $_facrec->date_when = $now;
+				$next_date = $_facrec->getNextDate();   // Calculate next date
+				$result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
+				//$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
+				$result = $_facrec->setNextDate($next_date,1);
 			}
 
 			// Define lang of customer
@@ -346,23 +346,23 @@ 
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang=$this->default_lang;                  // for thirdparty
 			if (! empty($newlang))
 			{
-			    $outputlangs = new Translate("",$conf);
-			    $outputlangs->setDefaultLang($newlang);
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($newlang);
 			}
 
 			// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 			$substitutionarray=array(
-			    '__TOTAL_HT__' => price($this->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency_code),
-			    '__TOTAL_TTC__' => price($this->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code),
-			    '__INVOICE_PREVIOUS_MONTH__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m'),
-			    '__INVOICE_MONTH__' => dol_print_date($this->date, '%m'),
-			    '__INVOICE_NEXT_MONTH__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m'),
-			    '__INVOICE_PREVIOUS_MONTH_TEXT__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B'),
-			    '__INVOICE_MONTH_TEXT__' => dol_print_date($this->date, '%B'),
-			    '__INVOICE_NEXT_MONTH_TEXT__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B'),
-			    '__INVOICE_PREVIOUS_YEAR__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y'),
-			    '__INVOICE_YEAR__' => dol_print_date($this->date, '%Y'),
-			    '__INVOICE_NEXT_YEAR__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y'),
+				'__TOTAL_HT__' => price($this->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency_code),
+				'__TOTAL_TTC__' => price($this->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code),
+				'__INVOICE_PREVIOUS_MONTH__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m'),
+				'__INVOICE_MONTH__' => dol_print_date($this->date, '%m'),
+				'__INVOICE_NEXT_MONTH__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m'),
+				'__INVOICE_PREVIOUS_MONTH_TEXT__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B'),
+				'__INVOICE_MONTH_TEXT__' => dol_print_date($this->date, '%B'),
+				'__INVOICE_NEXT_MONTH_TEXT__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B'),
+				'__INVOICE_PREVIOUS_YEAR__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y'),
+				'__INVOICE_YEAR__' => dol_print_date($this->date, '%Y'),
+				'__INVOICE_NEXT_YEAR__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y'),
 				// Only for tempalte invoice
 				'__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__' => dol_print_date($originaldatewhen, 'dayhour'),
 				'__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__' => dol_print_date(dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency), 'dayhour')
@@ -397,14 +397,14 @@ 
 		$sql.= ", note_private";
 		$sql.= ", note_public";
 		$sql.= ", ref_client, ref_int";
-        $sql.= ", fk_account";
+		$sql.= ", fk_account";
 		$sql.= ", fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
+		$sql.= ", fk_multicurrency";
+		$sql.= ", multicurrency_code";
+		$sql.= ", multicurrency_tx";
 		$sql.= ")";
 		$sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -433,7 +433,7 @@ 
 		$sql.= ", ".($this->situation_counter?"'".$this->db->escape($this->situation_counter)."'":"null");
 		$sql.= ", ".($this->situation_final?$this->situation_final:0);
 		$sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
@@ -456,28 +456,28 @@ 
 			{
 				foreach($this->linked_objects as $origin => $tmp_origin_id)
 				{
-				    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-				    {
-				        foreach($tmp_origin_id as $origin_id)
-				        {
-				            $ret = $this->add_object_linked($origin, $origin_id);
-				            if (! $ret)
-				            {
-				                dol_print_error($this->db);
-				                $error++;
-				            }
-				        }
-				    }
-				    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-				    {
-				        $origin_id = $tmp_origin_id;
-    					$ret = $this->add_object_linked($origin, $origin_id);
-    					if (! $ret)
-    					{
-    						dol_print_error($this->db);
-    						$error++;
-    					}
-				    }
+					if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+					{
+						foreach($tmp_origin_id as $origin_id)
+						{
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (! $ret)
+							{
+								dol_print_error($this->db);
+								$error++;
+							}
+						}
+					}
+					else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					{
+						$origin_id = $tmp_origin_id;
+						$ret = $this->add_object_linked($origin, $origin_id);
+						if (! $ret)
+						{
+							dol_print_error($this->db);
+							$error++;
+						}
+					}
 				}
 			}
 
@@ -487,20 +487,20 @@ 
 				$originidforcontact = $this->origin_id;
 				if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
 				{
-				    require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-				    $exp = new Expedition($this->db);
-				    $exp->fetch($this->origin_id);
-				    $exp->fetchObjectLinked();
-				    if (count($exp->linkedObjectsIds['commande']) > 0)
-				    {
-				        foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-				        {
-				            $originforcontact = 'commande';
-				            if (is_object($value)) $originidforcontact = $value->id;
-				            else $originidforcontact = $value;
-				            break; // We take first one
-				        }
-				    }
+					require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+					$exp = new Expedition($this->db);
+					$exp->fetch($this->origin_id);
+					$exp->fetchObjectLinked();
+					if (count($exp->linkedObjectsIds['commande']) > 0)
+					{
+						foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+						{
+							$originforcontact = 'commande';
+							if (is_object($value)) $originidforcontact = $value->id;
+							else $originidforcontact = $value;
+							break; // We take first one
+						}
+					}
 				}
 
 				$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
@@ -509,11 +509,11 @@ 
 				$resqlcontact = $this->db->query($sqlcontact);
 				if ($resqlcontact)
 				{
-				    while($objcontact = $this->db->fetch_object($resqlcontact))
-				    {
-				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
-				    }
+					while($objcontact = $this->db->fetch_object($resqlcontact))
+					{
+						//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+						$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+					}
 				}
 				else dol_print_error($resqlcontact);
 			}
@@ -533,7 +533,7 @@ 
 
 					// TODO This seems not used. Here we put origin 'facture' but after,  we put an id of object !
 					$newinvoiceline->origin = $this->element;
-                    $newinvoiceline->origin_id = $this->lines[$i]->id;
+					$newinvoiceline->origin_id = $this->lines[$i]->id;
 
 					if ($result >= 0)
 					{
@@ -566,13 +566,13 @@ 
 
 				foreach ($this->lines as $i => $val)
 				{
-                	$line = $this->lines[$i];
+					$line = $this->lines[$i];
 
-                	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+					//if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
+					if (! is_object($line)) $line = (object) $line;
 
-				    if ($result >= 0)
+					if ($result >= 0)
 					{
 						// Reset fk_parent_line for no child products and special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
@@ -598,8 +598,8 @@ 
 							$line->product_type,
 							$line->rang,
 							$line->special_code,
-                            $this->element,
-                            $line->id,
+							$this->element,
+							$line->id,
 							$fk_parent_line,
 							$line->fk_fournprice,
 							$line->pa_ht,
@@ -697,17 +697,17 @@ 
 						{*/
 					if (! $error)
 					{
-					    $result=$this->insertExtraFields();
-					    if ($result < 0) $error++;
+						$result=$this->insertExtraFields();
+						if ($result < 0) $error++;
 					}
 						/*}
 					}
 					else if ($reshook < 0) $error++;*/
 
-                    // Call trigger
-                    $result=$this->call_trigger('BILL_CREATE',$user);
-                    if ($result < 0) $error++;
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('BILL_CREATE',$user);
+					if ($result < 0) $error++;
+					// End call triggers
 
 					if (! $error)
 					{
@@ -757,14 +757,14 @@ 
 		// Charge facture source
 		$facture=new Facture($this->db);
 
-                $this->fetch_optionals();
-                if(!empty($this->array_options)){
-                    $facture->array_options = $this->array_options;
-                }
+				$this->fetch_optionals();
+				if(!empty($this->array_options)){
+					$facture->array_options = $this->array_options;
+				}
 
-                foreach($this->lines as &$line){
-                    $line->fetch_optionals();//fetch extrafields
-                }
+				foreach($this->lines as &$line){
+					$line->fetch_optionals();//fetch extrafields
+				}
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
@@ -926,10 +926,10 @@ 
 				if ($reshook < 0) $error++;
 			}
 
-            // Call trigger
-            $result=$this->call_trigger('BILL_CLONE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('BILL_CLONE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		unset($this->context['createfromclone']);
@@ -994,7 +994,7 @@ 
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
 
-            // get extrafields from original line
+			// get extrafields from original line
 			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
 			foreach($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
@@ -1018,7 +1018,7 @@ 
 		$this->origin				= $object->element;
 		$this->origin_id			= $object->id;
 
-        // get extrafields from original line
+		// get extrafields from original line
 		$object->fetch_optionals($object->id);
 		foreach($object->array_options as $options_key => $value)
 			$this->array_options[$options_key] = $value;
@@ -1083,16 +1083,16 @@ 
 	 *  @param  int		$max             			Maxlength of ref
 	 *  @param  int		$short           			1=Return just URL
 	 *  @param  string  $moretitle       			Add more text to title tooltip
-     *  @param	int  	$notooltip		 			1=Disable tooltip
-     *  @param  int     $addlinktonotes  			1=Add link to notes
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param  int     $addlinktonotes  			1=Add link to notes
+	 *  @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='', $max=0, $short=0, $moretitle='', $notooltip=0, $addlinktonotes=0, $save_lastsearch_value=-1)
 	{
 		global $langs, $conf, $user, $form;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result='';
 
@@ -1113,59 +1113,59 @@ 
 		if ($this->type == self::TYPE_REPLACEMENT) $picto.='r';	// Replacement invoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a';	// Credit note
 		if ($this->type == self::TYPE_DEPOSIT) $picto.='d';	// Deposit invoice
-        $label='';
-
-        if ($user->rights->facture->lire) {
-            $label = '<u>' . $langs->trans("ShowInvoice") . '</u>';
-            if (! empty($this->ref))
-                $label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
-            if (! empty($this->ref_client))
-                $label .= '<br><b>' . $langs->trans('RefCustomer') . ':</b> ' . $this->ref_client;
-            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 ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-    		if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-    		if ($this->type == self::TYPE_DEPOSIT) $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-    		if ($this->type == self::TYPE_SITUATION) $label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
-    		if ($moretitle) $label.=' - '.$moretitle;
-        }
+		$label='';
+
+		if ($user->rights->facture->lire) {
+			$label = '<u>' . $langs->trans("ShowInvoice") . '</u>';
+			if (! empty($this->ref))
+				$label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
+			if (! empty($this->ref_client))
+				$label .= '<br><b>' . $langs->trans('RefCustomer') . ':</b> ' . $this->ref_client;
+			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 ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+			if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+			if ($this->type == self::TYPE_DEPOSIT) $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+			if ($this->type == self::TYPE_SITUATION) $label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
+			if ($moretitle) $label.=' - '.$moretitle;
+		}
 
 		$linkclose='';
 		if (empty($notooltip) && $user->rights->facture->lire)
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowInvoice");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowInvoice");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
 		}
 
-        $linkstart='<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
+		$linkstart='<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		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 != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
 
 		if ($addlinktonotes)
 		{
-		    $txttoshow=($user->societe_id>0?$this->note_public:$this->note_private);
-		    if ($txttoshow)
-		    {
-                $notetoshow=$langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow,1);
-    		    $result.=' <span class="note inline-block">';
-    		    $result.='<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">'.img_picto('','object_generic').'</a>';
-    		    //$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-    		    //$result.='</a>';
-    		    $result.='</span>';
-		    }
+			$txttoshow=($user->societe_id>0?$this->note_public:$this->note_private);
+			if ($txttoshow)
+			{
+				$notetoshow=$langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow,1);
+				$result.=' <span class="note inline-block">';
+				$result.='<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">'.img_picto('','object_generic').'</a>';
+				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
+				//$result.='</a>';
+				$result.='</span>';
+			}
 		}
 
 		return $result;
@@ -1203,8 +1203,8 @@ 
 		$sql.= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
-        $sql.= ', f.fk_incoterms, f.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
+		$sql.= ', f.fk_incoterms, f.location_incoterms';
+		$sql.= ", i.libelle as libelle_incoterms";
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN (' . getEntity('c_payment_term').')';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
@@ -1375,7 +1375,7 @@ 
 				$line->qty              = $objp->qty;
 				$line->subprice         = $objp->subprice;
 
-                $line->vat_src_code     = $objp->vat_src_code;
+				$line->vat_src_code     = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
 				$line->localtax1_tx     = $objp->localtax1_tx;
 				$line->localtax2_tx     = $objp->localtax2_tx;
@@ -1551,10 +1551,10 @@ 
 		{
 			if (! $notrigger)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('BILL_MODIFY',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('BILL_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 		}
 
@@ -1620,13 +1620,13 @@ 
 			// Get buy/cost price of invoice that is source of discount
 			if ($remise->fk_facture_source > 0)
 			{
-    			$srcinvoice=new Facture($this->db);
-    			$srcinvoice->fetch($remise->fk_facture_source);
-    			$totalcostpriceofinvoice=0;
-    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';  // TODO Move this into commonobject
-    			$formmargin=new FormMargin($this->db);
-    			$arraytmp=$formmargin->getMarginInfosArray($srcinvoice, false);
-        		$facligne->pa_ht = $arraytmp['pa_total'];
+				$srcinvoice=new Facture($this->db);
+				$srcinvoice->fetch($remise->fk_facture_source);
+				$totalcostpriceofinvoice=0;
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';  // TODO Move this into commonobject
+				$formmargin=new FormMargin($this->db);
+				$arraytmp=$formmargin->getMarginInfosArray($srcinvoice, false);
+				$facligne->pa_ht = $arraytmp['pa_total'];
 			}
 
 			$facligne->total_ht  = -$remise->amount_ht;
@@ -1686,7 +1686,7 @@ 
 	 */
 	function set_ref_client($ref_client, $notrigger=0)
 	{
-	    global $user;
+		global $user;
 
 		$error=0;
 
@@ -1768,10 +1768,10 @@ 
 
 		if (! $error && ! $notrigger)
 		{
-            // Call trigger
-            $result=$this->call_trigger('BILL_DELETE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('BILL_DELETE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		// Removed extrafields
@@ -1939,10 +1939,10 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('BILL_PAYED',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('BILL_PAYED',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 			else
 			{
@@ -1990,10 +1990,10 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-            // Call trigger
-            $result=$this->call_trigger('BILL_UNPAYED',$user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('BILL_UNPAYED',$user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 		else
 		{
@@ -2050,14 +2050,14 @@ 
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('BILL_CANCEL',$user);
-	            if ($result < 0)
-	            {
+				// Call trigger
+				$result=$this->call_trigger('BILL_CANCEL',$user);
+				if ($result < 0)
+				{
 					$this->db->rollback();
 					return -1;
 				}
-	            // End call triggers
+				// End call triggers
 
 				$this->db->commit();
 				return 1;
@@ -2085,7 +2085,7 @@ 
 	 * @param   string	$force_number	Reference to force on invoice
 	 * @param	int		$idwarehouse	Id of warehouse to use for stock decrease if option to decreasenon stock is on (0=no decrease)
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
+	 * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
 	 */
 	function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
 	{
@@ -2109,12 +2109,12 @@ 
 		}
 		if (count($this->lines) <= 0)
 		{
-        	$langs->load("errors");
+			$langs->load("errors");
 			$this->error=$langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
 		}
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
 		{
 			$this->error='Permission denied';
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
@@ -2245,10 +2245,10 @@ 
 			// Trigger calls
 			if (! $error && ! $notrigger)
 			{
-	            // Call trigger
-	            $result=$this->call_trigger('BILL_VALIDATE',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('BILL_VALIDATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 
 			if (! $error)
@@ -2271,16 +2271,16 @@ 
 						if (@rename($dirsource, $dirdest))
 						{
 							dol_syslog("Rename ok");
-	                        // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->facture->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);
-	                        }
+							// Rename docs starting with $oldref with $newref
+							$listoffiles=dol_dir_list($conf->facture->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);
+							}
 						}
 					}
 				}
@@ -2304,18 +2304,18 @@ 
 				$this->date_validation=$now;
 				$i = 0;
 
-                if (!empty($conf->global->INVOICE_USE_SITUATION))
-                {
-    				$final = True;
-    				$nboflines = count($this->lines);
-    				while (($i < $nboflines) && $final) {
-    					$final = ($this->lines[$i]->situation_percent == 100);
-    					$i++;
-    				}
-    				if ($final) {
-    					$this->setFinal($user);
-    				}
-                }
+				if (!empty($conf->global->INVOICE_USE_SITUATION))
+				{
+					$final = True;
+					$nboflines = count($this->lines);
+					while (($i < $nboflines) && $final) {
+						$final = ($this->lines[$i]->situation_percent == 100);
+						$i++;
+					}
+					if ($final) {
+						$this->setFinal($user);
+					}
+				}
 			}
 		}
 		else
@@ -2428,15 +2428,15 @@ 
 				$old_statut=$this->statut;
 				$this->brouillon = 1;
 				$this->statut = self::STATUS_DRAFT;
-	            // Call trigger
-	            $result=$this->call_trigger('BILL_UNVALIDATE',$user);
-	            if ($result < 0)
+				// Call trigger
+				$result=$this->call_trigger('BILL_UNVALIDATE',$user);
+				if ($result < 0)
 				{
 					$error++;
 					$this->statut=$old_statut;
 					$this->brouillon=0;
 				}
-	            // End call triggers
+				// End call triggers
 			} else {
 				$this->db->rollback();
 				return -1;
@@ -2531,8 +2531,8 @@ 
 		$vat_src_code='';
 		if (preg_match('/\((.*)\)/', $txtva, $reg))
 		{
-		    $vat_src_code = $reg[1];
-		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			$vat_src_code = $reg[1];
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
 		}
 
 		$remise_percent=price2num($remise_percent);
@@ -2568,8 +2568,8 @@ 
 				$product_type=$product->type;
 
 				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -2591,8 +2591,8 @@ 
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
 			// Rank to use
@@ -2655,8 +2655,8 @@ 
 			$this->line->multicurrency_code			= $this->multicurrency_code;
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			if (is_array($array_options) && count($array_options)>0) {
 				$this->line->array_options=$array_options;
@@ -2713,7 +2713,7 @@ 
 	 * 	@param		int			$pa_ht				Price (without tax) of product when it was bought
 	 * 	@param		string		$label				Label of the line (deprecated, do not use)
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
-     *  @param		array		$array_options		extrafields array
+	 *  @param		array		$array_options		extrafields array
 	 * 	@param      int         $situation_percent  Situation advance percentage
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
@@ -2771,12 +2771,12 @@ 
 			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 
 			// Clean vat code
-    		$vat_src_code='';
-    		if (preg_match('/\((.*)\)/', $txtva, $reg))
-    		{
-    		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-    		}
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$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, $mysoc, $localtaxes_type, $situation_percent, $this->multicurrency_tx, $pu_ht_devise);
 
@@ -2791,8 +2791,8 @@ 
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
 			// Old properties: $price, $remise (deprecated)
@@ -2816,8 +2816,8 @@ 
 				$product_type=$product->type;
 
 				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -2827,7 +2827,7 @@ 
 
 			$line->oldline = $staticline;
 			$this->line = $line;
-            $this->line->context = $this->context;
+			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
 			if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
@@ -2871,8 +2871,8 @@ 
 			// Multicurrency
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			if (is_array($array_options) && count($array_options)>0) {
 				$this->line->array_options=$array_options;
@@ -2891,7 +2891,7 @@ 
 			}
 			else
 			{
-			    $this->error=$this->line->error;
+				$this->error=$this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
@@ -2939,7 +2939,7 @@ 
 	 */
 	function update_percent($line, $percent)
 	{
-	    global $mysoc,$user;
+		global $mysoc,$user;
 
 		include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php');
 
@@ -2965,7 +2965,7 @@ 
 	 */
 	function deleteline($rowid)
 	{
-        global $user;
+		global $user;
 
 		dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
 
@@ -2993,7 +2993,7 @@ 
 
 		$line=new FactureLigne($this->db);
 
-        $line->context = $this->context;
+		$line->context = $this->context;
 
 		// For triggers
 		$result = $line->fetch($rowid);
@@ -3245,8 +3245,8 @@ 
 				// Load file with numbering class (if found)
 				if (is_file($dir.$file) && is_readable($dir.$file))
 				{
-                    $mybool |= include_once $dir . $file;
-                }
+					$mybool |= include_once $dir . $file;
+				}
 			}
 
 			// For compatibility
@@ -3262,8 +3262,8 @@ 
 
 					// Load file with numbering class (if found)
 					if (is_file($dir.$file) && is_readable($dir.$file)) {
-                        $mybool |= include_once $dir . $file;
-                    }
+						$mybool |= include_once $dir . $file;
+					}
 				}
 			}
 
@@ -3614,11 +3614,11 @@ 
 
 		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0)
 		{
-	        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-	        $bac = new CompanyBankAccount($this->db);
-	        $bac->fetch(0,$this->socid);
+			require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+			$bac = new CompanyBankAccount($this->db);
+			$bac->fetch(0,$this->socid);
 
-        	$sql = 'SELECT count(*)';
+			$sql = 'SELECT count(*)';
 			$sql.= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
 			$sql.= ' WHERE fk_facture = '.$this->id;
 			$sql.= ' AND traite = 0';
@@ -3632,15 +3632,15 @@ 
 				{
 					$now=dol_now();
 
-                    $totalpaye  = $this->getSommePaiement();
-                    $totalcreditnotes = $this->getSumCreditNotesUsed();
-                    $totaldeposits = $this->getSumDepositsUsed();
-                    //print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
+					$totalpaye  = $this->getSommePaiement();
+					$totalcreditnotes = $this->getSumCreditNotesUsed();
+					$totaldeposits = $this->getSumDepositsUsed();
+					//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
 
-                    // We can also use bcadd to avoid pb with floating points
-                    // For example print 239.2 - 229.3 - 9.9; does not return 0.
-                    //$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
-                    //$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
+					// We can also use bcadd to avoid pb with floating points
+					// For example print 239.2 - 229.3 - 9.9; does not return 0.
+					//$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+					//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
 					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
 
 					if (is_numeric($amount) && $amount != 0)
@@ -3660,52 +3660,52 @@ 
 						$resql=$this->db->query($sql);
 						if (! $resql)
 						{
-						    $this->error=$this->db->lasterror();
-						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
-						    $error++;
+							$this->error=$this->db->lasterror();
+							dol_syslog(get_class($this).'::demandeprelevement Erreur');
+							$error++;
 						}
 					}
 					else
 					{
 						$this->error='WithdrawRequestErrorNilAmount';
-	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
-	                    $error++;
+						dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
+						$error++;
+					}
+
+					if (! $error)
+					{
+						// Force payment mode of invoice to withdraw
+						$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
+						if ($payment_mode_id > 0)
+						{
+							$result=$this->setPaymentMethods($payment_mode_id);
+						}
 					}
 
-        			if (! $error)
-        			{
-        				// Force payment mode of invoice to withdraw
-        				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
-        				if ($payment_mode_id > 0)
-        				{
-        					$result=$this->setPaymentMethods($payment_mode_id);
-        				}
-        			}
-
-                    if ($error) return -1;
-                    return 1;
-                }
-                else
-                {
-                    $this->error="A request already exists";
-                    dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
-                    return 0;
-                }
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
-                return -2;
-            }
-        }
-        else
-        {
-            $this->error="Status of invoice does not allow this";
-            dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
-            return -3;
-        }
-    }
+					if ($error) return -1;
+					return 1;
+				}
+				else
+				{
+					$this->error="A request already exists";
+					dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
+					return 0;
+				}
+			}
+			else
+			{
+				$this->error=$this->db->error();
+				dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error="Status of invoice does not allow this";
+			dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
+			return -3;
+		}
+	}
 
 	/**
 	 *  Supprime une demande de prelevement
@@ -3833,7 +3833,7 @@ 
 		$arraynow=dol_getdate($now);
 		$nownotime=dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -4006,7 +4006,7 @@ 
 			{
 				$this->nb["invoices"]=$obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		}
 		else
@@ -4024,7 +4024,7 @@ 
 	 */
 	function getLinesArray()
 	{
-	    return $this->fetch_lines();
+		return $this->fetch_lines();
 	}
 
 	/**
@@ -4247,8 +4247,8 @@ 
  */
 class FactureLigne extends CommonInvoiceLine
 {
-    public $element='facturedet';
-    public $table_element='facturedet';
+	public $element='facturedet';
+	public $table_element='facturedet';
 
 	var $oldline;
 
@@ -4410,7 +4410,7 @@ 
 		}
 		else
 		{
-		    $this->error = $this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -4428,9 +4428,9 @@ 
 
 		$error=0;
 
-        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
 		// Clean parameters
 		$this->desc=trim($this->desc);
@@ -4505,7 +4505,7 @@ 
 		$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
 		$sql.= " '".$this->db->escape($this->desc)."',";
 		$sql.= " ".price2num($this->qty).",";
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
 		$sql.= " ".price2num($this->tva_tx).",";
 		$sql.= " ".price2num($this->localtax1_tx).",";
 		$sql.= " ".price2num($this->localtax2_tx).",";
@@ -4548,15 +4548,15 @@ 
 		{
 			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
 
-            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 (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$this->id=$this->rowid;
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			// Si fk_remise_except defini, on lie la remise a la facture
 			// ce qui la flague comme "consommee".
@@ -4569,16 +4569,16 @@ 
 					// Check if discount was found
 					if ($result > 0)
 					{
-					    // Check if discount not already affected to another invoice
+						// Check if discount not already affected to another invoice
 						if ($discount->fk_facture_line > 0)
 						{
-						    if (empty($noerrorifdiscountalreadylinked))
-						    {
-    							$this->error=$langs->trans("ErrorDiscountAlreadyUsed",$discount->id);
-    							dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
-    							$this->db->rollback();
-    							return -3;
-						    }
+							if (empty($noerrorifdiscountalreadylinked))
+							{
+								$this->error=$langs->trans("ErrorDiscountAlreadyUsed",$discount->id);
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+								$this->db->rollback();
+								return -3;
+							}
 						}
 						else
 						{
@@ -4611,14 +4611,14 @@ 
 
 			if (! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('LINEBILL_INSERT',$user);
-                if ($result < 0)
-                {
+				// Call trigger
+				$result=$this->call_trigger('LINEBILL_INSERT',$user);
+				if ($result < 0)
+				{
 					$this->db->rollback();
 					return -2;
 				}
-                // End call triggers
+				// End call triggers
 			}
 
 			$this->db->commit();
@@ -4688,34 +4688,34 @@ 
 
 		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
-        $sql.= " description='".$this->db->escape($this->desc)."'";
-        $sql.= ", label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-        $sql.= ", subprice=".price2num($this->subprice)."";
-        $sql.= ", remise_percent=".price2num($this->remise_percent)."";
-        if ($this->fk_remise_except) $sql.= ", fk_remise_except=".$this->fk_remise_except;
-        else $sql.= ", fk_remise_except=null";
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
+		$sql.= " description='".$this->db->escape($this->desc)."'";
+		$sql.= ", label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
+		$sql.= ", subprice=".price2num($this->subprice)."";
+		$sql.= ", remise_percent=".price2num($this->remise_percent)."";
+		if ($this->fk_remise_except) $sql.= ", fk_remise_except=".$this->fk_remise_except;
+		else $sql.= ", fk_remise_except=null";
 		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->db->escape($this->vat_src_code))."'";
-        $sql.= ", tva_tx=".price2num($this->tva_tx)."";
-        $sql.= ", localtax1_tx=".price2num($this->localtax1_tx)."";
-        $sql.= ", localtax2_tx=".price2num($this->localtax2_tx)."";
+		$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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-        $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-        $sql.= ", product_type=".$this->product_type;
-        $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $sql.= ", special_code='".$this->db->escape($this->special_code)."'";
-        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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
+		$sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+		$sql.= ", product_type=".$this->product_type;
+		$sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
+		$sql.= ", special_code='".$this->db->escape($this->special_code)."'";
+		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)."'";
 		$sql.= ", fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
@@ -4726,9 +4726,9 @@ 
 
 		// 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;
 
@@ -4736,26 +4736,26 @@ 
 		$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 (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('LINEBILL_UPDATE',$user);
-                if ($result < 0)
+				// Call trigger
+				$result=$this->call_trigger('LINEBILL_UPDATE',$user);
+				if ($result < 0)
  				{
 					$this->db->rollback();
 					return -2;
 				}
-                // End call triggers
+				// End call triggers
 			}
 			$this->db->commit();
 			return 1;
@@ -4771,7 +4771,7 @@ 
 	/**
 	 * 	Delete line in database
 	 *  TODO Add param User $user and notrigger (see skeleton)
-     *
+	 *
 	 *	@return	    int		           <0 if KO, >0 if OK
 	 */
 	function delete()
@@ -4856,10 +4856,10 @@ 
 		if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
 			return 0;
 		} else {
-		    // If invoice is a not a situation invoice, this->fk_prev_id is used for something else
-            $tmpinvoice=new Facture($this->db);
-            $tmpinvoice->fetch($invoiceid);
-            if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0;
+			// If invoice is a not a situation invoice, this->fk_prev_id is used for something else
+			$tmpinvoice=new Facture($this->db);
+			$tmpinvoice->fetch($invoiceid);
+			if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0;
 
 			$sql = 'SELECT situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet WHERE rowid=' . $this->fk_prev_id;
 			$resql = $this->db->query($sql);

Spacing +1202 added lines, -1202 removed lines

@@ -48,12 +48,12 @@ 
  */
 class Facture extends CommonInvoice
 {
-	public $element='facture';
-	public $table_element='facture';
+	public $element = 'facture';
+	public $table_element = 'facture';
 	public $table_element_line = 'facturedet';
 	public $fk_element = 'fk_facture';
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	public $picto='bill';
+	protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto = 'bill';
 
 	/**
 	 * {@inheritdoc}
@@ -65,9 +65,9 @@ 
 	public $author;
 	public $fk_user_author;
 	public $fk_user_valid;
-	public $date;              // Date invoice
-	public $date_creation;		// Creation date
-	public $date_validation;	// Validation date
+	public $date; // Date invoice
+	public $date_creation; // Creation date
+	public $date_validation; // Validation date
 	public $datem;
 	public $ref_client;
 	public $ref_int;
@@ -77,9 +77,9 @@ 
 	//var $amount;
 	public $remise_absolue;
 	public $remise_percent;
-	public $total_ht=0;
-	public $total_tva=0;
-	public $total_ttc=0;
+	public $total_ht = 0;
+	public $total_tva = 0;
+	public $total_ttc = 0;
 	public $revenuestamp;
 
 	//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
@@ -91,21 +91,21 @@ 
 	public $paye;
 	//! id of source invoice if replacement invoice or credit note
 	public $fk_facture_source;
-	public $linked_objects=array();
+	public $linked_objects = array();
 	public $date_lim_reglement;
-	public $cond_reglement_code;		// Code in llx_c_paiement
-	public $mode_reglement_code;		// Code in llx_c_paiement
-	public $fk_bank;					// Field to store bank id to use when payment mode is withdraw
+	public $cond_reglement_code; // Code in llx_c_paiement
+	public $mode_reglement_code; // Code in llx_c_paiement
+	public $fk_bank; // Field to store bank id to use when payment mode is withdraw
 	/**
 	 * @deprecated
 	 */
-	public $products=array();
+	public $products = array();
 	/**
 	 * @var FactureLigne[]
 	 */
-	public $lines=array();
+	public $lines = array();
 	public $line;
-	public $extraparams=array();
+	public $extraparams = array();
 	public $specimen;
 
 	public $fac_rec;
@@ -136,12 +136,12 @@ 
 	/**
 	 * @var array Table of previous situations
 	 */
-	public $tab_previous_situation_invoice=array();
+	public $tab_previous_situation_invoice = array();
 
 	/**
 	 * @var array Table of next situations
 	 */
-	public $tab_next_situation_invoice=array();
+	public $tab_next_situation_invoice = array();
 
 	public $oldcopy;
 
@@ -228,24 +228,24 @@ 
 	 * 	@param	int		$forceduedate	1=Do not recalculate due date from payment condition but force it with value
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function create($user,$notrigger=0,$forceduedate=0)
+	function create($user, $notrigger = 0, $forceduedate = 0)
 	{
-		global $langs,$conf,$mysoc,$hookmanager;
-		$error=0;
+		global $langs, $conf, $mysoc, $hookmanager;
+		$error = 0;
 
 		// Clean parameters
 		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-		$this->ref_client=trim($this->ref_client);
-		$this->note=(isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
-		$this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note_private));
-		$this->note_public=trim($this->note_public);
-		if (! $this->cond_reglement_id) $this->cond_reglement_id = 0;
-		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
+		$this->ref_client = trim($this->ref_client);
+		$this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
+		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note_private));
+		$this->note_public = trim($this->note_public);
+		if (!$this->cond_reglement_id) $this->cond_reglement_id = 0;
+		if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
 		$this->brouillon = 1;
         if (empty($this->entity)) $this->entity = $conf->entity;
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
@@ -259,20 +259,20 @@ 
 		// Check parameters
 		if (empty($this->date) || empty($user->id))
 		{
-			$this->error="ErrorBadParameter";
+			$this->error = "ErrorBadParameter";
 			dol_syslog(get_class($this)."::create Try to create an invoice with an empty parameter (user, date, ...)", LOG_ERR);
 			return -3;
 		}
 		$soc = new Societe($this->db);
-		$result=$soc->fetch($this->socid);
+		$result = $soc->fetch($this->socid);
 		if ($result < 0)
 		{
-			$this->error="Failed to fetch company: ".$soc->error;
+			$this->error = "Failed to fetch company: ".$soc->error;
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -2;
 		}
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
@@ -283,18 +283,18 @@ 
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
-			$result=$_facrec->fetch($this->fac_rec);
-			$result=$_facrec->fetchObjectLinked();       // This load $_facrec->linkedObjectsIds
+			$result = $_facrec->fetch($this->fac_rec);
+			$result = $_facrec->fetchObjectLinked(); // This load $_facrec->linkedObjectsIds
 
 			$originaldatewhen = $_facrec->date_when;
 
-			$this->socid 		     = $_facrec->socid;  // Invoice created on same thirdparty than template
+			$this->socid = $_facrec->socid; // Invoice created on same thirdparty than template
 			$this->entity            = $_facrec->entity; // Invoice created in same entity than template
 
 			// Fields coming from GUI (priority on template). TODO Value of template should be used as default value on GUI so we can use here always value from GUI
-			$this->fk_project        = GETPOST('projectid','int') > 0 ? GETPOST('projectid','int') : $_facrec->fk_project;
-			$this->note_public       = GETPOST('note_public','none') ? GETPOST('note_public','none') : $_facrec->note_public;
-			$this->note_private      = GETPOST('note_private','none') ? GETPOST('note_private','none') : $_facrec->note_private;
+			$this->fk_project        = GETPOST('projectid', 'int') > 0 ? GETPOST('projectid', 'int') : $_facrec->fk_project;
+			$this->note_public       = GETPOST('note_public', 'none') ? GETPOST('note_public', 'none') : $_facrec->note_public;
+			$this->note_private      = GETPOST('note_private', 'none') ? GETPOST('note_private', 'none') : $_facrec->note_private;
 			$this->modelpdf          = GETPOST('model') ? GETPOST('model') : $_facrec->modelpdf;
 			$this->cond_reglement_id = GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $_facrec->cond_reglement_id;
 			$this->mode_reglement_id = GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $_facrec->mode_reglement_id;
@@ -307,20 +307,20 @@ 
 			// Fields always coming from template
 			$this->remise_absolue    = $_facrec->remise_absolue;
 			$this->remise_percent    = $_facrec->remise_percent;
-			$this->fk_incoterms		 = $_facrec->fk_incoterms;
-			$this->location_incoterms= $_facrec->location_incoterms;
+			$this->fk_incoterms = $_facrec->fk_incoterms;
+			$this->location_incoterms = $_facrec->location_incoterms;
 
 			// Clean parameters
-			if (! $this->type) $this->type = self::TYPE_STANDARD;
-			$this->ref_client=trim($this->ref_client);
-			$this->note_public=trim($this->note_public);
-			$this->note_private=trim($this->note_private);
-		    $this->note_private=dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
+			if (!$this->type) $this->type = self::TYPE_STANDARD;
+			$this->ref_client = trim($this->ref_client);
+			$this->note_public = trim($this->note_public);
+			$this->note_private = trim($this->note_private);
+		    $this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
 
-		    $this->array_options=$_facrec->array_options;
+		    $this->array_options = $_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
-			if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
+			if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
 			$this->brouillon = 1;
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
@@ -332,26 +332,26 @@ 
 			{
 			    dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
 			    if (empty($_facrec->date_when)) $_facrec->date_when = $now;
-                $next_date = $_facrec->getNextDate();   // Calculate next date
+                $next_date = $_facrec->getNextDate(); // Calculate next date
                 $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
                 //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
-                $result = $_facrec->setNextDate($next_date,1);
+                $result = $_facrec->setNextDate($next_date, 1);
 			}
 
 			// Define lang of customer
 			$outputlangs = $langs;
-			$newlang='';
+			$newlang = '';
 
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) $newlang=$this->thirdparty->default_lang;  // for proposal, order, invoice, ...
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang=$this->default_lang;                  // for thirdparty
-			if (! empty($newlang))
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) $newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang = $this->default_lang; // for thirdparty
+			if (!empty($newlang))
 			{
-			    $outputlangs = new Translate("",$conf);
+			    $outputlangs = new Translate("", $conf);
 			    $outputlangs->setDefaultLang($newlang);
 			}
 
 			// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-			$substitutionarray=array(
+			$substitutionarray = array(
 			    '__TOTAL_HT__' => price($this->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency_code),
 			    '__TOTAL_TTC__' => price($this->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code),
 			    '__INVOICE_PREVIOUS_MONTH__' => dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m'),
@@ -370,98 +370,98 @@ 
 
 			//var_dump($substitutionarray);exit;
 
-			$substitutionisok=true;
+			$substitutionisok = true;
 			complete_substitutions_array($substitutionarray, $outputlangs);
 
-			$this->note_public=make_substitutions($this->note_public,$substitutionarray);
-			$this->note_private=make_substitutions($this->note_private,$substitutionarray);
+			$this->note_public = make_substitutions($this->note_public, $substitutionarray);
+			$this->note_private = make_substitutions($this->note_private, $substitutionarray);
 		}
 
 		// Define due date if not already defined
-		$datelim=(empty($forceduedate)?$this->calculate_date_lim_reglement():$forceduedate);
+		$datelim = (empty($forceduedate) ? $this->calculate_date_lim_reglement() : $forceduedate);
 
 		// Insert into database
 		$socid  = $this->socid;
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture (";
-		$sql.= " facnumber";
-		$sql.= ", entity";
-		$sql.= ", ref_ext";
-		$sql.= ", type";
-		$sql.= ", fk_soc";
-		$sql.= ", datec";
-		$sql.= ", remise_absolue";
-		$sql.= ", remise_percent";
-		$sql.= ", datef";
-		$sql.= ", date_pointoftax";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", ref_client, ref_int";
-        $sql.= ", fk_account";
-		$sql.= ", fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
-		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
-		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
-		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-		$sql.= ")";
-		$sql.= " VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$this->entity;
-		$sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
-		$sql.= ", '".$this->db->escape($this->type)."'";
-		$sql.= ", '".$socid."'";
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".($this->remise_absolue>0?$this->remise_absolue:'NULL');
-		$sql.= ", ".($this->remise_percent>0?$this->remise_percent:'NULL');
-		$sql.= ", '".$this->db->idate($this->date)."'";
-		$sql.= ", ".(strval($this->date_pointoftax)!='' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null');
-		$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
-		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-		$sql.= ", ".($this->fk_fac_rec_source?"'".$this->db->escape($this->fk_fac_rec_source)."'":"null");
-		$sql.= ", ".($this->fk_facture_source?"'".$this->db->escape($this->fk_facture_source)."'":"null");
-		$sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
-		$sql.= ", ".($this->fk_project?$this->fk_project:"null");
-		$sql.= ", ".$this->cond_reglement_id;
-		$sql.= ", ".$this->mode_reglement_id;
-		$sql.= ", '".$this->db->idate($datelim)."', '".$this->db->escape($this->modelpdf)."'";
-		$sql.= ", ".($this->situation_cycle_ref?"'".$this->db->escape($this->situation_cycle_ref)."'":"null");
-		$sql.= ", ".($this->situation_counter?"'".$this->db->escape($this->situation_counter)."'":"null");
-		$sql.= ", ".($this->situation_final?$this->situation_final:0);
-		$sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-		$sql.=")";
-
-		$resql=$this->db->query($sql);
+		$sql .= " facnumber";
+		$sql .= ", entity";
+		$sql .= ", ref_ext";
+		$sql .= ", type";
+		$sql .= ", fk_soc";
+		$sql .= ", datec";
+		$sql .= ", remise_absolue";
+		$sql .= ", remise_percent";
+		$sql .= ", datef";
+		$sql .= ", date_pointoftax";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", ref_client, ref_int";
+        $sql .= ", fk_account";
+		$sql .= ", fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
+		$sql .= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
+		$sql .= ", situation_cycle_ref, situation_counter, situation_final";
+		$sql .= ", fk_incoterms, location_incoterms";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+		$sql .= ")";
+		$sql .= " VALUES (";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$this->entity;
+		$sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+		$sql .= ", '".$this->db->escape($this->type)."'";
+		$sql .= ", '".$socid."'";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');
+		$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');
+		$sql .= ", '".$this->db->idate($this->date)."'";
+		$sql .= ", ".(strval($this->date_pointoftax) != '' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null');
+		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
+		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".($this->fk_fac_rec_source ? "'".$this->db->escape($this->fk_fac_rec_source)."'" : "null");
+		$sql .= ", ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null");
+		$sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "null");
+		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
+		$sql .= ", ".$this->cond_reglement_id;
+		$sql .= ", ".$this->mode_reglement_id;
+		$sql .= ", '".$this->db->idate($datelim)."', '".$this->db->escape($this->modelpdf)."'";
+		$sql .= ", ".($this->situation_cycle_ref ? "'".$this->db->escape($this->situation_cycle_ref)."'" : "null");
+		$sql .= ", ".($this->situation_counter ? "'".$this->db->escape($this->situation_counter)."'" : "null");
+		$sql .= ", ".($this->situation_final ? $this->situation_final : 0);
+		$sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".(double) $this->multicurrency_tx;
+		$sql .= ")";
+
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture');
 
 			// Update ref with new one
-			$this->ref='(PROV'.$this->id.')';
+			$this->ref = '(PROV'.$this->id.')';
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
-			$resql=$this->db->query($sql);
-			if (! $resql) $error++;
+			$resql = $this->db->query($sql);
+			if (!$resql) $error++;
 
 			// Add object linked
-			if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
 			{
-				foreach($this->linked_objects as $origin => $tmp_origin_id)
+				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
 				    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
 				    {
-				        foreach($tmp_origin_id as $origin_id)
+				        foreach ($tmp_origin_id as $origin_id)
 				        {
 				            $ret = $this->add_object_linked($origin, $origin_id);
-				            if (! $ret)
+				            if (!$ret)
 				            {
 				                dol_print_error($this->db);
 				                $error++;
@@ -472,7 +472,7 @@ 
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
-    					if (! $ret)
+    					if (!$ret)
     					{
     						dol_print_error($this->db);
     						$error++;
@@ -481,13 +481,13 @@ 
 				}
 			}
 
-			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
 			{
 				$originforcontact = $this->origin;
 				$originidforcontact = $this->origin_id;
 				if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
 				{
-				    require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+				    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 				    $exp = new Expedition($this->db);
 				    $exp->fetch($this->origin_id);
 				    $exp->fetchObjectLinked();
@@ -504,15 +504,15 @@ 
 				}
 
 				$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-				$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+				$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
 
 				$resqlcontact = $this->db->query($sqlcontact);
 				if ($resqlcontact)
 				{
-				    while($objcontact = $this->db->fetch_object($resqlcontact))
+				    while ($objcontact = $this->db->fetch_object($resqlcontact))
 				    {
 				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 				    }
 				}
 				else dol_print_error($resqlcontact);
@@ -528,8 +528,8 @@ 
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
 				foreach ($this->lines as $i => $val)
 				{
-					$newinvoiceline=$this->lines[$i];
-					$newinvoiceline->fk_facture=$this->id;
+					$newinvoiceline = $this->lines[$i];
+					$newinvoiceline->fk_facture = $this->id;
 
 					// TODO This seems not used. Here we put origin 'facture' but after,  we put an id of object !
 					$newinvoiceline->origin = $this->element;
@@ -542,8 +542,8 @@ 
 							$fk_parent_line = 0;
 						}
 
-						$newinvoiceline->fk_parent_line=$fk_parent_line;
-						$result=$newinvoiceline->insert();
+						$newinvoiceline->fk_parent_line = $fk_parent_line;
+						$result = $newinvoiceline->insert();
 
 						// Defined the new fk_parent_line
 						if ($result > 0 && $newinvoiceline->product_type == 9) {
@@ -552,7 +552,7 @@ 
 					}
 					if ($result < 0)
 					{
-						$this->error=$newinvoiceline->error;
+						$this->error = $newinvoiceline->error;
 						$error++;
 						break;
 					}
@@ -570,7 +570,7 @@ 
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+                	if (!is_object($line)) $line = (object) $line;
 
 				    if ($result >= 0)
 					{
@@ -611,7 +611,7 @@ 
 						);
 						if ($result < 0)
 						{
-							$this->error=$this->db->lasterror();
+							$this->error = $this->db->lasterror();
 							dol_print_error($this->db);
 							$this->db->rollback();
 							return -1;
@@ -628,20 +628,20 @@ 
 			/*
 			 * Insert lines of predefined invoices
 			 */
-			if (! $error && $this->fac_rec > 0)
+			if (!$error && $this->fac_rec > 0)
 			{
 				foreach ($_facrec->lines as $i => $val)
 				{
 					if ($_facrec->lines[$i]->fk_product)
 					{
 						$prod = new Product($this->db);
-						$res=$prod->fetch($_facrec->lines[$i]->fk_product);
+						$res = $prod->fetch($_facrec->lines[$i]->fk_product);
 					}
-					$tva_tx = get_default_tva($mysoc,$soc,$prod->id);
-					$tva_npr = get_default_npr($mysoc,$soc,$prod->id);
-					if (empty($tva_tx)) $tva_npr=0;
-					$localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
-					$localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
+					$tva_tx = get_default_tva($mysoc, $soc, $prod->id);
+					$tva_npr = get_default_npr($mysoc, $soc, $prod->id);
+					if (empty($tva_tx)) $tva_npr = 0;
+					$localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
+					$localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
 
 					$result_insert = $this->addline(
 						$_facrec->lines[$i]->desc,
@@ -652,7 +652,7 @@ 
 						$localtax2_tx,
 						$_facrec->lines[$i]->fk_product,
 						$_facrec->lines[$i]->remise_percent,
-						'','',0,$tva_npr,'','HT',0,
+						'', '', 0, $tva_npr, '', 'HT', 0,
 						$_facrec->lines[$i]->product_type,
 						$_facrec->lines[$i]->rang,
 						$_facrec->lines[$i]->special_code,
@@ -662,28 +662,28 @@ 
 						null,
 						0,
 						$_facrec->lines[$i]->label,
-						empty($_facrec->lines[$i]->array_options)?null:$_facrec->lines[$i]->array_options,
+						empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
 						$_facrec->lines[$i]->situation_percent,
 						'',
 						$_facrec->lines[$i]->fk_unit
 					);
 
-					if ( $result_insert < 0)
+					if ($result_insert < 0)
 					{
 						$error++;
-						$this->error=$this->db->error();
+						$this->error = $this->db->error();
 						break;
 					}
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 
-				$result=$this->update_price(1);
+				$result = $this->update_price(1);
 				if ($result > 0)
 				{
-					$action='create';
+					$action = 'create';
 
 					// Actions on extra fields (by external module or standard code)
 					// TODO le hook fait double emploi avec le trigger !!
@@ -695,9 +695,9 @@ 
 					{
 						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 						{*/
-					if (! $error)
+					if (!$error)
 					{
-					    $result=$this->insertExtraFields();
+					    $result = $this->insertExtraFields();
 					    if ($result < 0) $error++;
 					}
 						/*}
@@ -705,11 +705,11 @@ 
 					else if ($reshook < 0) $error++;*/
 
                     // Call trigger
-                    $result=$this->call_trigger('BILL_CREATE',$user);
+                    $result = $this->call_trigger('BILL_CREATE', $user);
                     if ($result < 0) $error++;
                     // End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						$this->db->commit();
 						return $this->id;
@@ -722,7 +722,7 @@ 
 				}
 				else
 				{
-					$this->error=$langs->trans('FailedToUpdatePrice');
+					$this->error = $langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
@@ -736,7 +736,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -750,20 +750,20 @@ 
 	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function createFromCurrent($user,$invertdetail=0)
+	function createFromCurrent($user, $invertdetail = 0)
 	{
 		global $conf;
 
 		// Charge facture source
-		$facture=new Facture($this->db);
+		$facture = new Facture($this->db);
 
                 $this->fetch_optionals();
-                if(!empty($this->array_options)){
+                if (!empty($this->array_options)) {
                     $facture->array_options = $this->array_options;
                 }
 
-                foreach($this->lines as &$line){
-                    $line->fetch_optionals();//fetch extrafields
+                foreach ($this->lines as &$line) {
+                    $line->fetch_optionals(); //fetch extrafields
                 }
 
 		$facture->fk_facture_source = $this->fk_facture_source;
@@ -784,14 +784,14 @@ 
 		$facture->origin                        = $this->origin;
 		$facture->origin_id                     = $this->origin_id;
 
-		$facture->lines		    	= $this->lines;	// Tableau des lignes de factures
-		$facture->products		    = $this->lines;	// Tant que products encore utilise
+		$facture->lines = $this->lines; // Tableau des lignes de factures
+		$facture->products = $this->lines; // Tant que products encore utilise
 		$facture->situation_counter = $this->situation_counter;
-		$facture->situation_cycle_ref=$this->situation_cycle_ref;
-		$facture->situation_final  = $this->situation_final;
+		$facture->situation_cycle_ref = $this->situation_cycle_ref;
+		$facture->situation_final = $this->situation_final;
 
 		// Loop on each line of new invoice
-		foreach($facture->lines as $i => $tmpline)
+		foreach ($facture->lines as $i => $tmpline)
 		{
 			$facture->lines[$i]->fk_prev_id = $this->lines[$i]->rowid;
 			if ($invertdetail)
@@ -810,8 +810,8 @@ 
 		$facid = $facture->create($user);
 		if ($facid <= 0)
 		{
-			$this->error=$facture->error;
-			$this->errors=$facture->errors;
+			$this->error = $facture->error;
+			$this->errors = $facture->errors;
 		}
 		elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
 		{
@@ -838,18 +838,18 @@ 
 	 *		@param		int				$socid			Id of thirdparty
 	 * 	 	@return		int								New id of clone
 	 */
-	function createFromClone($socid=0)
+	function createFromClone($socid = 0)
 	{
-		global $user,$hookmanager;
+		global $user, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
 		$this->context['createfromclone'] = 'createfromclone';
 
 		$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
@@ -858,27 +858,27 @@ 
 
 
 		// Change socid if needed
-		if (! empty($socid) && $socid != $this->socid)
+		if (!empty($socid) && $socid != $this->socid)
 		{
 			$objsoc = new Societe($this->db);
 
-			if ($objsoc->fetch($socid)>0)
+			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->fk_delivery_address	= '';
+				$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->fk_delivery_address = '';
 			}
 
 			// TODO Change product price if multi-prices
 		}
 
-		$this->id=0;
-		$this->statut= self::STATUS_DRAFT;
+		$this->id = 0;
+		$this->statut = self::STATUS_DRAFT;
 
 		// Clear fields
-		$this->date               = dol_now();	// Date of invoice is set to current date when cloning. // TODO Best is to ask date into confirm box
+		$this->date               = dol_now(); // Date of invoice is set to current date when cloning. // TODO Best is to ask date into confirm box
 		$this->user_author        = $user->id;
 		$this->user_valid         = '';
 		$this->fk_facture_source  = 0;
@@ -887,20 +887,20 @@ 
 		$this->ref_client         = '';
 		$this->close_code         = '';
 		$this->close_note         = '';
-		$this->products = $this->lines;	// Tant que products encore utilise
+		$this->products = $this->lines; // Tant que products encore utilise
 
 		// Loop on each line of new invoice
-		foreach($this->lines as $i => $line)
+		foreach ($this->lines as $i => $line)
 		{
 			if (($this->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
 			{
 				unset($this->lines[$i]);
-				unset($this->products[$i]);	// Tant que products encore utilise
+				unset($this->products[$i]); // Tant que products encore utilise
 			}
 		}
 
 		// Create clone
-		$result=$this->create($user);
+		$result = $this->create($user);
 		if ($result < 0) $error++;
 		else {
 			// copy internal contacts
@@ -915,19 +915,19 @@ 
 			}
 		}
 
-		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('BILL_CLONE',$user);
+            $result = $this->call_trigger('BILL_CLONE', $user);
             if ($result < 0) $error++;
             // End call triggers
 		}
@@ -935,7 +935,7 @@ 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $this->id;
@@ -955,48 +955,48 @@ 
 	 */
 	function createFromOrder($object)
 	{
-		global $user,$hookmanager;
+		global $user, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
 		// Closed order
 		$this->date = dol_now();
 		$this->source = 0;
 
-		$num=count($object->lines);
+		$num = count($object->lines);
 		for ($i = 0; $i < $num; $i++)
 		{
 			$line = new FactureLigne($this->db);
 
-			$line->libelle			= $object->lines[$i]->libelle;
+			$line->libelle = $object->lines[$i]->libelle;
 			$line->label			= $object->lines[$i]->label;
 			$line->desc				= $object->lines[$i]->desc;
 			$line->subprice			= $object->lines[$i]->subprice;
 			$line->total_ht			= $object->lines[$i]->total_ht;
 			$line->total_tva		= $object->lines[$i]->total_tva;
 			$line->total_ttc		= $object->lines[$i]->total_ttc;
-			$line->vat_src_code  	= $object->lines[$i]->vat_src_code;
-			$line->tva_tx			= $object->lines[$i]->tva_tx;
+			$line->vat_src_code = $object->lines[$i]->vat_src_code;
+			$line->tva_tx = $object->lines[$i]->tva_tx;
 			$line->localtax1_tx		= $object->lines[$i]->localtax1_tx;
 			$line->localtax2_tx		= $object->lines[$i]->localtax2_tx;
-			$line->qty				= $object->lines[$i]->qty;
-			$line->fk_remise_except	= $object->lines[$i]->fk_remise_except;
-			$line->remise_percent	= $object->lines[$i]->remise_percent;
-			$line->fk_product		= $object->lines[$i]->fk_product;
-			$line->info_bits		= $object->lines[$i]->info_bits;
+			$line->qty = $object->lines[$i]->qty;
+			$line->fk_remise_except = $object->lines[$i]->fk_remise_except;
+			$line->remise_percent = $object->lines[$i]->remise_percent;
+			$line->fk_product = $object->lines[$i]->fk_product;
+			$line->info_bits = $object->lines[$i]->info_bits;
 			$line->product_type		= $object->lines[$i]->product_type;
-			$line->rang				= $object->lines[$i]->rang;
+			$line->rang = $object->lines[$i]->rang;
 			$line->special_code		= $object->lines[$i]->special_code;
-			$line->fk_parent_line	= $object->lines[$i]->fk_parent_line;
-			$line->fk_unit			= $object->lines[$i]->fk_unit;
+			$line->fk_parent_line = $object->lines[$i]->fk_parent_line;
+			$line->fk_unit = $object->lines[$i]->fk_unit;
 
-			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
+			$line->fk_fournprice = $object->lines[$i]->fk_fournprice;
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
 
             // get extrafields from original line
 			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
-			foreach($object->lines[$i]->array_options as $options_key => $value)
+			foreach ($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
 
 			$this->lines[$i] = $line;
@@ -1015,17 +1015,17 @@ 
 		$this->note_private         = $object->note_private;
 		$this->note_public          = $object->note_public;
 
-		$this->origin				= $object->element;
-		$this->origin_id			= $object->id;
+		$this->origin = $object->element;
+		$this->origin_id = $object->id;
 
         // get extrafields from original line
 		$object->fetch_optionals($object->id);
-		foreach($object->array_options as $options_key => $value)
+		foreach ($object->array_options as $options_key => $value)
 			$this->array_options[$options_key] = $value;
 
 		// Possibility to add external linked objects with hooks
 		$this->linked_objects[$this->origin] = $this->origin_id;
-		if (! empty($object->other_linked_objects) && is_array($object->other_linked_objects))
+		if (!empty($object->other_linked_objects) && is_array($object->other_linked_objects))
 		{
 			$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
 		}
@@ -1037,12 +1037,12 @@ 
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('invoicedao'));
 
-			$parameters=array('objFrom'=>$object);
-			$action='';
-			$reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('objFrom'=>$object);
+			$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 (! $error)
+			if (!$error)
 			{
 				return 1;
 			}
@@ -1057,21 +1057,21 @@ 
 	 * @param	int				$withpicto			Add download picto into link
 	 * @return	string			HTML link to file
 	 */
-	function getDirectExternalLink($withpicto=0)
+	function getDirectExternalLink($withpicto = 0)
 	{
 		global $dolibarr_main_url_root;
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 		// TODO Read into ecmfile table to get entry and hash exists (PS: If not found, add it)
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($this->db);
+		$ecmfile = new EcmFiles($this->db);
 		//$result = $ecmfile->get();
 
-		$hashp='todo';
+		$hashp = 'todo';
 		return '<a href="'.$urlwithroot.'/document.php?modulepart=invoice&hashp='.$hashp.'" target="_download" rel="noindex, nofollow">'.$this->ref.'</a>';
 	}
 
@@ -1088,13 +1088,13 @@ 
      *  @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='', $max=0, $short=0, $moretitle='', $notooltip=0, $addlinktonotes=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $addlinktonotes = 0, $save_lastsearch_value = -1)
 	{
 		global $langs, $conf, $user, $form;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-		$result='';
+		$result = '';
 
 		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
 		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
@@ -1104,67 +1104,67 @@ 
 		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';
 		}
 
-		$picto='bill';
-		if ($this->type == self::TYPE_REPLACEMENT) $picto.='r';	// Replacement invoice
-		if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a';	// Credit note
-		if ($this->type == self::TYPE_DEPOSIT) $picto.='d';	// Deposit invoice
-        $label='';
+		$picto = 'bill';
+		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
+		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
+		if ($this->type == self::TYPE_DEPOSIT) $picto .= 'd'; // Deposit invoice
+        $label = '';
 
         if ($user->rights->facture->lire) {
-            $label = '<u>' . $langs->trans("ShowInvoice") . '</u>';
-            if (! empty($this->ref))
-                $label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
-            if (! empty($this->ref_client))
-                $label .= '<br><b>' . $langs->trans('RefCustomer') . ':</b> ' . $this->ref_client;
-            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 ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-    		if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-    		if ($this->type == self::TYPE_DEPOSIT) $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-    		if ($this->type == self::TYPE_SITUATION) $label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
-    		if ($moretitle) $label.=' - '.$moretitle;
+            $label = '<u>'.$langs->trans("ShowInvoice").'</u>';
+            if (!empty($this->ref))
+                $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+            if (!empty($this->ref_client))
+                $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+            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 ($this->type == self::TYPE_REPLACEMENT) $label = $langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+    		if ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+    		if ($this->type == self::TYPE_DEPOSIT) $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+    		if ($this->type == self::TYPE_SITUATION) $label = $langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
+    		if ($moretitle) $label .= ' - '.$moretitle;
         }
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip) && $user->rights->facture->lire)
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		    {
-		        $label=$langs->trans("ShowInvoice");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		        $label = $langs->trans("ShowInvoice");
+		        $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 = '<a href="'.$url.'"';
+        $linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        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 != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
+        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 != 2) $result .= $linkstart.($max ?dol_trunc($this->ref, $max) : $this->ref).$linkend;
 
 		if ($addlinktonotes)
 		{
-		    $txttoshow=($user->societe_id>0?$this->note_public:$this->note_private);
+		    $txttoshow = ($user->societe_id > 0 ? $this->note_public : $this->note_private);
 		    if ($txttoshow)
 		    {
-                $notetoshow=$langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow,1);
-    		    $result.=' <span class="note inline-block">';
-    		    $result.='<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">'.img_picto('','object_generic').'</a>';
+                $notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
+    		    $result .= ' <span class="note inline-block">';
+    		    $result .= '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">'.img_picto('', 'object_generic').'</a>';
     		    //$result.=img_picto($langs->trans("ViewNote"),'object_generic');
     		    //$result.='</a>';
-    		    $result.='</span>';
+    		    $result .= '</span>';
 		    }
 		}
 
@@ -1181,39 +1181,39 @@ 
 	 *  @param		bool	$fetch_situation	Fetch the previous and next situation in $tab_previous_situation_invoice and $tab_next_situation_invoice
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $fetch_situation=false)
+	function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $fetch_situation = false)
 	{
 		global $conf;
 
 		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
 		$sql = 'SELECT f.rowid,f.facnumber,f.ref_client,f.ref_ext,f.ref_int,f.type,f.fk_soc,f.amount';
-		$sql.= ', f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc, f.revenuestamp';
-		$sql.= ', f.remise_percent, f.remise_absolue, f.remise';
-		$sql.= ', f.datef as df, f.date_pointoftax';
-		$sql.= ', f.date_lim_reglement as dlr';
-		$sql.= ', f.datec as datec';
-		$sql.= ', f.date_valid as datev';
-		$sql.= ', f.tms as datem';
-		$sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
-		$sql.= ', f.fk_facture_source';
-		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
-		$sql.= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
-		$sql.= ', f.fk_account';
-		$sql.= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
-		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
-        $sql.= ', f.fk_incoterms, f.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN (' . getEntity('c_payment_term').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
-		$sql.= ' WHERE f.entity = '.$conf->entity;
-		if ($rowid)   $sql.= " AND f.rowid=".$rowid;
-		if ($ref)     $sql.= " AND f.facnumber='".$this->db->escape($ref)."'";
-		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
-		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
+		$sql .= ', f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc, f.revenuestamp';
+		$sql .= ', f.remise_percent, f.remise_absolue, f.remise';
+		$sql .= ', f.datef as df, f.date_pointoftax';
+		$sql .= ', f.date_lim_reglement as dlr';
+		$sql .= ', f.datec as datec';
+		$sql .= ', f.date_valid as datev';
+		$sql .= ', f.tms as datem';
+		$sql .= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
+		$sql .= ', f.fk_facture_source';
+		$sql .= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
+		$sql .= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
+		$sql .= ', f.fk_account';
+		$sql .= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
+		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql .= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
+        $sql .= ', f.fk_incoterms, f.location_incoterms';
+        $sql .= ", i.libelle as libelle_incoterms";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN ('.getEntity('c_payment_term').')';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN ('.getEntity('c_paiement').')';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
+		$sql .= ' WHERE f.entity = '.$conf->entity;
+		if ($rowid)   $sql .= " AND f.rowid=".$rowid;
+		if ($ref)     $sql .= " AND f.facnumber='".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql .= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($ref_int) $sql .= " AND f.ref_int='".$this->db->escape($ref_int)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1223,17 +1223,17 @@ 
 			{
 				$obj = $this->db->fetch_object($result);
 
-				$this->id					= $obj->rowid;
-				$this->ref					= $obj->facnumber;
-				$this->ref_client			= $obj->ref_client;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->facnumber;
+				$this->ref_client = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->ref_int				= $obj->ref_int;
 				$this->type					= $obj->type;
 				$this->date					= $this->db->jdate($obj->df);
 				$this->date_pointoftax		= $this->db->jdate($obj->date_pointoftax);
-				$this->date_creation		= $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_validation		= $this->db->jdate($obj->datev);
-				$this->datem				= $this->db->jdate($obj->datem);
+				$this->datem = $this->db->jdate($obj->datem);
 				$this->remise_percent		= $obj->remise_percent;
 				$this->remise_absolue		= $obj->remise_absolue;
 				$this->total_ht				= $obj->total;
@@ -1241,33 +1241,33 @@ 
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
 				$this->total_ttc			= $obj->total_ttc;
-				$this->revenuestamp         = $obj->revenuestamp;
+				$this->revenuestamp = $obj->revenuestamp;
 				$this->paye					= $obj->paye;
 				$this->close_code			= $obj->close_code;
 				$this->close_note			= $obj->close_note;
 				$this->socid				= $obj->fk_soc;
-				$this->statut				= $obj->fk_statut;
-				$this->date_lim_reglement	= $this->db->jdate($obj->dlr);
+				$this->statut = $obj->fk_statut;
+				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
 				$this->mode_reglement_id	= $obj->fk_mode_reglement;
 				$this->mode_reglement_code	= $obj->mode_reglement_code;
 				$this->mode_reglement		= $obj->mode_reglement_libelle;
 				$this->cond_reglement_id	= $obj->fk_cond_reglement;
 				$this->cond_reglement_code	= $obj->cond_reglement_code;
 				$this->cond_reglement		= $obj->cond_reglement_libelle;
-				$this->cond_reglement_doc	= $obj->cond_reglement_libelle_doc;
-				$this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
-				$this->fk_project			= $obj->fk_projet;
-				$this->fk_facture_source	= $obj->fk_facture_source;
-				$this->note					= $obj->note_private;	// deprecated
-				$this->note_private			= $obj->note_private;
+				$this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
+				$this->fk_account = ($obj->fk_account > 0) ? $obj->fk_account : null;
+				$this->fk_project = $obj->fk_projet;
+				$this->fk_facture_source = $obj->fk_facture_source;
+				$this->note = $obj->note_private; // deprecated
+				$this->note_private = $obj->note_private;
 				$this->note_public			= $obj->note_public;
 				$this->user_author			= $obj->fk_user_author;
-				$this->user_valid			= $obj->fk_user_valid;
-				$this->modelpdf				= $obj->model_pdf;
+				$this->user_valid = $obj->fk_user_valid;
+				$this->modelpdf = $obj->model_pdf;
 				$this->situation_cycle_ref  = $obj->situation_cycle_ref;
 				$this->situation_counter    = $obj->situation_counter;
 				$this->situation_final      = $obj->situation_final;
-				$this->extraparams			= (array) json_decode($obj->extraparams, true);
+				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -1276,9 +1276,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;
 
@@ -1292,34 +1292,34 @@ 
 				// Retrieve 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);
 
 				/*
 				 * Lines
 				*/
 
-				$this->lines  = array();
+				$this->lines = array();
 
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
-					$this->error=$this->db->error();
+					$this->error = $this->db->error();
 					return -3;
 				}
 				return 1;
 			}
 			else
 			{
-				$this->error='Bill with id '.$rowid.' or ref '.$ref.' not found';
+				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -1332,21 +1332,21 @@ 
 	 */
 	function fetch_lines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_facture, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-		$sql.= ' l.situation_percent, l.fk_prev_id,';
-		$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
-		$sql.= ' l.rang, l.special_code,';
-		$sql.= ' l.date_start as date_start, l.date_end as date_end,';
-		$sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
-		$sql.= ' l.fk_unit,';
-		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
-		$sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql.= ' WHERE l.fk_facture = '.$this->id;
-		$sql.= ' ORDER BY l.rang, l.rowid';
+		$sql .= ' l.situation_percent, l.fk_prev_id,';
+		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
+		$sql .= ' l.rang, l.special_code,';
+		$sql .= ' l.date_start as date_start, l.date_end as date_end,';
+		$sql .= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
+		$sql .= ' l.fk_unit,';
+		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
+		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= ' WHERE l.fk_facture = '.$this->id;
+		$sql .= ' ORDER BY l.rang, l.rowid';
 
 		dol_syslog(get_class($this).'::fetch_lines', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1360,22 +1360,22 @@ 
 				$line = new FactureLigne($this->db);
 
 				$line->id               = $objp->rowid;
-				$line->rowid	        = $objp->rowid;             // deprecated
+				$line->rowid = $objp->rowid; // deprecated
 				$line->fk_facture       = $objp->fk_facture;
-				$line->label            = $objp->custom_label;		// deprecated
-				$line->desc             = $objp->description;		// Description line
-				$line->description      = $objp->description;		// Description line
-				$line->product_type     = $objp->product_type;		// Type of line
-				$line->ref              = $objp->product_ref;		// Ref product
-				$line->product_ref      = $objp->product_ref;		// Ref product
-				$line->libelle          = $objp->product_label;		// TODO deprecated
-				$line->product_label	= $objp->product_label;		// Label product
-				$line->product_desc     = $objp->product_desc;		// Description product
-				$line->fk_product_type  = $objp->fk_product_type;	// Type of product
+				$line->label            = $objp->custom_label; // deprecated
+				$line->desc             = $objp->description; // Description line
+				$line->description      = $objp->description; // Description line
+				$line->product_type     = $objp->product_type; // Type of line
+				$line->ref              = $objp->product_ref; // Ref product
+				$line->product_ref      = $objp->product_ref; // Ref product
+				$line->libelle          = $objp->product_label; // TODO deprecated
+				$line->product_label = $objp->product_label; // Label product
+				$line->product_desc     = $objp->product_desc; // Description product
+				$line->fk_product_type  = $objp->fk_product_type; // Type of product
 				$line->qty              = $objp->qty;
 				$line->subprice         = $objp->subprice;
 
-                $line->vat_src_code     = $objp->vat_src_code;
+                $line->vat_src_code = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
 				$line->localtax1_tx     = $objp->localtax1_tx;
 				$line->localtax2_tx     = $objp->localtax2_tx;
@@ -1395,21 +1395,21 @@ 
 				$line->total_localtax2  = $objp->total_localtax2;
 				$line->total_ttc        = $objp->total_ttc;
 				$line->code_ventilation = $objp->fk_code_ventilation;
-				$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->rang				= $objp->rang;
-				$line->special_code		= $objp->special_code;
-				$line->fk_parent_line	= $objp->fk_parent_line;
-				$line->situation_percent= $objp->situation_percent;
+				$line->rang = $objp->rang;
+				$line->special_code = $objp->special_code;
+				$line->fk_parent_line = $objp->fk_parent_line;
+				$line->situation_percent = $objp->situation_percent;
 				$line->fk_prev_id       = $objp->fk_prev_id;
-				$line->fk_unit	        = $objp->fk_unit;
+				$line->fk_unit = $objp->fk_unit;
 
 				// 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;
@@ -1424,7 +1424,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -3;
 		}
 	}
@@ -1467,22 +1467,22 @@ 
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *      @return     int      			   	<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type= self::TYPE_STANDARD;
-		if (isset($this->facnumber)) $this->facnumber=trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client=trim($this->ref_client);
-		if (isset($this->increment)) $this->increment=trim($this->increment);
-		if (isset($this->close_code)) $this->close_code=trim($this->close_code);
-		if (isset($this->close_note)) $this->close_note=trim($this->close_note);
-		if (isset($this->note) || isset($this->note_private)) $this->note=(isset($this->note) ? trim($this->note) : trim($this->note_private));		// deprecated
-		if (isset($this->note) || isset($this->note_private)) $this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (isset($this->facnumber)) $this->facnumber = trim($this->ref);
+		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
+		if (isset($this->increment)) $this->increment = trim($this->increment);
+		if (isset($this->close_code)) $this->close_code = trim($this->close_code);
+		if (isset($this->close_note)) $this->close_note = trim($this->close_note);
+		if (isset($this->note) || isset($this->note_private)) $this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
+		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 		if (empty($this->situation_cycle_ref)) {
 			$this->situation_cycle_ref = 'null';
 		}
@@ -1501,58 +1501,58 @@ 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture SET";
 
-		$sql.= " facnumber=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " type=".(isset($this->type)?$this->type:"null").",";
-		$sql.= " ref_client=".(isset($this->ref_client)?"'".$this->db->escape($this->ref_client)."'":"null").",";
-		$sql.= " increment=".(isset($this->increment)?"'".$this->db->escape($this->increment)."'":"null").",";
-		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
-		$sql.= " datec=".(strval($this->date_creation)!='' ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
-		$sql.= " datef=".(strval($this->date)!='' ? "'".$this->db->idate($this->date)."'" : 'null').",";
-		$sql.= " date_pointoftax=".(strval($this->date_pointoftax)!='' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null').",";
-		$sql.= " date_valid=".(strval($this->date_validation)!='' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
-		$sql.= " paye=".(isset($this->paye)?$this->paye:"null").",";
-		$sql.= " remise_percent=".(isset($this->remise_percent)?$this->remise_percent:"null").",";
-		$sql.= " remise_absolue=".(isset($this->remise_absolue)?$this->remise_absolue:"null").",";
-		$sql.= " close_code=".(isset($this->close_code)?"'".$this->db->escape($this->close_code)."'":"null").",";
-		$sql.= " close_note=".(isset($this->close_note)?"'".$this->db->escape($this->close_note)."'":"null").",";
-		$sql.= " tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
-		$sql.= " localtax1=".(isset($this->total_localtax1)?$this->total_localtax1:"null").",";
-		$sql.= " localtax2=".(isset($this->total_localtax2)?$this->total_localtax2:"null").",";
-		$sql.= " total=".(isset($this->total_ht)?$this->total_ht:"null").",";
-		$sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
-		$sql.= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '')?$this->revenuestamp:"null").",";
-		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " fk_user_author=".(isset($this->user_author)?$this->user_author:"null").",";
-		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-		$sql.= " fk_facture_source=".(isset($this->fk_facture_source)?$this->fk_facture_source:"null").",";
-		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-		$sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
-		$sql.= " fk_mode_reglement=".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null").",";
-		$sql.= " date_lim_reglement=".(strval($this->date_lim_reglement)!='' ? "'".$this->db->idate($this->date_lim_reglement)."'" : '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.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ", situation_cycle_ref=".$this->situation_cycle_ref;
-		$sql.= ", situation_counter=".$this->situation_counter;
-		$sql.= ", situation_final=".$this->situation_final;
-
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " facnumber=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " type=".(isset($this->type) ? $this->type : "null").",";
+		$sql .= " ref_client=".(isset($this->ref_client) ? "'".$this->db->escape($this->ref_client)."'" : "null").",";
+		$sql .= " increment=".(isset($this->increment) ? "'".$this->db->escape($this->increment)."'" : "null").",";
+		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
+		$sql .= " datec=".(strval($this->date_creation) != '' ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
+		$sql .= " datef=".(strval($this->date) != '' ? "'".$this->db->idate($this->date)."'" : 'null').",";
+		$sql .= " date_pointoftax=".(strval($this->date_pointoftax) != '' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null').",";
+		$sql .= " date_valid=".(strval($this->date_validation) != '' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
+		$sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
+		$sql .= " remise_percent=".(isset($this->remise_percent) ? $this->remise_percent : "null").",";
+		$sql .= " remise_absolue=".(isset($this->remise_absolue) ? $this->remise_absolue : "null").",";
+		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
+		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
+		$sql .= " tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
+		$sql .= " localtax1=".(isset($this->total_localtax1) ? $this->total_localtax1 : "null").",";
+		$sql .= " localtax2=".(isset($this->total_localtax2) ? $this->total_localtax2 : "null").",";
+		$sql .= " total=".(isset($this->total_ht) ? $this->total_ht : "null").",";
+		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
+		$sql .= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '') ? $this->revenuestamp : "null").",";
+		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " fk_user_author=".(isset($this->user_author) ? $this->user_author : "null").",";
+		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
+		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
+		$sql .= " date_lim_reglement=".(strval($this->date_lim_reglement) != '' ? "'".$this->db->idate($this->date_lim_reglement)."'" : '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 .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= ", situation_cycle_ref=".$this->situation_cycle_ref;
+		$sql .= ", situation_counter=".$this->situation_counter;
+		$sql .= ", situation_final=".$this->situation_final;
+
+		$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)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('BILL_MODIFY',$user);
+	            $result = $this->call_trigger('BILL_MODIFY', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
@@ -1561,13 +1561,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			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
 		{
@@ -1592,40 +1592,40 @@ 
 
 		$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;
 			}
 
-			$facligne=new FactureLigne($this->db);
-			$facligne->fk_facture=$this->id;
-			$facligne->fk_remise_except=$remise->id;
-			$facligne->desc=$remise->description;   	// Description ligne
-			$facligne->vat_src_code=$remise->vat_src_code;
-			$facligne->tva_tx=$remise->tva_tx;
+			$facligne = new FactureLigne($this->db);
+			$facligne->fk_facture = $this->id;
+			$facligne->fk_remise_except = $remise->id;
+			$facligne->desc = $remise->description; // Description ligne
+			$facligne->vat_src_code = $remise->vat_src_code;
+			$facligne->tva_tx = $remise->tva_tx;
 			$facligne->subprice = -$remise->amount_ht;
-			$facligne->fk_product=0;					// Id produit predefini
-			$facligne->qty=1;
-			$facligne->remise_percent=0;
-			$facligne->rang=-1;
-			$facligne->info_bits=2;
+			$facligne->fk_product = 0; // Id produit predefini
+			$facligne->qty = 1;
+			$facligne->remise_percent = 0;
+			$facligne->rang = -1;
+			$facligne->info_bits = 2;
 
 			// Get buy/cost price of invoice that is source of discount
 			if ($remise->fk_facture_source > 0)
 			{
-    			$srcinvoice=new Facture($this->db);
+    			$srcinvoice = new Facture($this->db);
     			$srcinvoice->fetch($remise->fk_facture_source);
-    			$totalcostpriceofinvoice=0;
-    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';  // TODO Move this into commonobject
-    			$formmargin=new FormMargin($this->db);
-    			$arraytmp=$formmargin->getMarginInfosArray($srcinvoice, false);
+    			$totalcostpriceofinvoice = 0;
+    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
+    			$formmargin = new FormMargin($this->db);
+    			$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
         		$facligne->pa_ht = $arraytmp['pa_total'];
 			}
 
@@ -1638,17 +1638,17 @@ 
 			$facligne->multicurrency_total_tva = -$remise->multicurrency_total_tva;
 			$facligne->multicurrency_total_ttc = -$remise->multicurrency_total_ttc;
 
-			$lineid=$facligne->insert();
+			$lineid = $facligne->insert();
 			if ($lineid > 0)
 			{
-				$result=$this->update_price(1);
+				$result = $this->update_price(1);
 				if ($result > 0)
 				{
 					// Create linke between discount and invoice line
-					$result=$remise->link_to_invoice($lineid,0);
+					$result = $remise->link_to_invoice($lineid, 0);
 					if ($result < 0)
 					{
-						$this->error=$remise->error;
+						$this->error = $remise->error;
 						$this->db->rollback();
 						return -4;
 					}
@@ -1658,14 +1658,14 @@ 
 				}
 				else
 				{
-					$this->error=$facligne->error;
+					$this->error = $facligne->error;
 					$this->db->rollback();
 					return -1;
 				}
 			}
 			else
 			{
-				$this->error=$facligne->error;
+				$this->error = $facligne->error;
 				$this->db->rollback();
 				return -2;
 			}
@@ -1684,11 +1684,11 @@ 
 	 *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function set_ref_client($ref_client, $notrigger=0)
+	function set_ref_client($ref_client, $notrigger = 0)
 	{
 	    global $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -1700,27 +1700,27 @@ 
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if (!$resql)
 		{
-			$this->errors[]=$this->db->error();
+			$this->errors[] = $this->db->error();
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->ref_client = $ref_client;
 		}
 
-		if (! $notrigger && empty($error))
+		if (!$notrigger && empty($error))
 		{
 			// Call trigger
-			$result=$this->call_trigger('BILL_MODIFY',$user);
+			$result = $this->call_trigger('BILL_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 
 			$this->ref_client = $ref_client;
@@ -1730,13 +1730,13 @@ 
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -1748,12 +1748,12 @@ 
 	 *	@param		int		$idwarehouse	Id warehouse to use for stock change.
 	 *	@return		int						<0 if KO, 0=Refused, >0 if OK
 	 */
-	function delete($user, $notrigger=0, $idwarehouse=-1)
+	function delete($user, $notrigger = 0, $idwarehouse = -1)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$rowid=$this->id;
+		$rowid = $this->id;
 
 		dol_syslog(get_class($this)."::delete rowid=".$rowid.", ref=".$this->ref.", thirdparty=".$this->thirdparty->name, LOG_DEBUG);
 
@@ -1762,21 +1762,21 @@ 
 
 		if ($test <= 0) return $test;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
             // Call trigger
-            $result=$this->call_trigger('BILL_DELETE',$user);
+            $result = $this->call_trigger('BILL_DELETE', $user);
             if ($result < 0) $error++;
             // End call triggers
 		}
 
 		// Removed extrafields
-		if (! $error) {
-			$result=$this->deleteExtraFields();
+		if (!$error) {
+			$result = $this->deleteExtraFields();
 			if ($result < 0)
 			{
 				$error++;
@@ -1784,52 +1784,52 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
 			if ($res < 0) $error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// If invoice was converted into a discount not yet consumed, we remove discount
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except';
-			$sql.= ' WHERE fk_facture_source = '.$rowid;
-			$sql.= ' AND fk_facture_line IS NULL';
-			$resql=$this->db->query($sql);
+			$sql .= ' WHERE fk_facture_source = '.$rowid;
+			$sql .= ' AND fk_facture_line IS NULL';
+			$resql = $this->db->query($sql);
 
 			// If invoice has consumned discounts
 			$this->fetch_lines();
-			$list_rowid_det=array();
-			foreach($this->lines as $key => $invoiceline)
+			$list_rowid_det = array();
+			foreach ($this->lines as $key => $invoiceline)
 			{
-				$list_rowid_det[]=$invoiceline->rowid;
+				$list_rowid_det[] = $invoiceline->rowid;
 			}
 
 			// Consumned discounts are freed
 			if (count($list_rowid_det))
 			{
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
-				$sql.= ' SET fk_facture = NULL, fk_facture_line = NULL';
-				$sql.= ' WHERE fk_facture_line IN ('.join(',',$list_rowid_det).')';
+				$sql .= ' SET fk_facture = NULL, fk_facture_line = NULL';
+				$sql .= ' WHERE fk_facture_line IN ('.join(',', $list_rowid_det).')';
 
 				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-				if (! $this->db->query($sql))
+				if (!$this->db->query($sql))
 				{
-					$this->error=$this->db->error()." sql=".$sql;
+					$this->error = $this->db->error()." sql=".$sql;
 					$this->db->rollback();
 					return -5;
 				}
 			}
 
 			// If we decrement stock on invoice validation, we increment
-			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse!=-1)
+			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse != -1)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
 					if ($this->lines[$i]->fk_product > 0)
@@ -1837,8 +1837,8 @@ 
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr",$this->ref));
-						else $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr",$this->ref));	// we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
+						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
 					}
 				}
 			}
@@ -1855,31 +1855,31 @@ 
 
 				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					// On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
 					if ($conf->facture->dir_output && !empty($this->ref))
 					{
-						$dir = $conf->facture->dir_output . "/" . $ref;
-						$file = $conf->facture->dir_output . "/" . $ref . "/" . $ref . ".pdf";
+						$dir = $conf->facture->dir_output."/".$ref;
+						$file = $conf->facture->dir_output."/".$ref."/".$ref.".pdf";
 						if (file_exists($file))	// We must delete all files before deleting directory
 						{
-							$ret=dol_delete_preview($this);
+							$ret = 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=$langs->trans("ErrorCanNotDeleteFile",$file);
+								$this->error = $langs->trans("ErrorCanNotDeleteFile", $file);
 								$this->db->rollback();
 								return 0;
 							}
 						}
 						if (file_exists($dir))
 						{
-							if (! dol_delete_dir_recursive($dir)) // For remove dir and meta
+							if (!dol_delete_dir_recursive($dir)) // For remove dir and meta
 							{
-								$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+								$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 								$this->db->rollback();
 								return 0;
 							}
@@ -1891,14 +1891,14 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror()." sql=".$sql;
+					$this->error = $this->db->lasterror()." sql=".$sql;
 					$this->db->rollback();
 					return -6;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror()." sql=".$sql;
+				$this->error = $this->db->lasterror()." sql=".$sql;
 				$this->db->rollback();
 				return -4;
 			}
@@ -1919,9 +1919,9 @@ 
 	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function set_paid($user, $close_code='', $close_note='')
+	function set_paid($user, $close_code = '', $close_note = '')
 	{
-		$error=0;
+		$error = 0;
 
 		if ($this->paye != 1)
 		{
@@ -1929,28 +1929,28 @@ 
 
 			dol_syslog(get_class($this)."::set_paid rowid=".$this->id, LOG_DEBUG);
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
-			$sql.= ' fk_statut='.self::STATUS_CLOSED;
-			if (! $close_code) $sql.= ', paye=1';
-			if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'";
-			if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
-			$sql.= ' WHERE rowid = '.$this->id;
+			$sql .= ' fk_statut='.self::STATUS_CLOSED;
+			if (!$close_code) $sql .= ', paye=1';
+			if ($close_code) $sql .= ", close_code='".$this->db->escape($close_code)."'";
+			if ($close_note) $sql .= ", close_note='".$this->db->escape($close_note)."'";
+			$sql .= ' WHERE rowid = '.$this->id;
 
 			dol_syslog(get_class($this)."::set_paid", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('BILL_PAYED',$user);
+	            $result = $this->call_trigger('BILL_PAYED', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
@@ -1978,31 +1978,31 @@ 
 	 */
 	function set_unpaid($user)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-		$sql.= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null';
-		$sql.= ' WHERE rowid = '.$this->id;
+		$sql .= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null';
+		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
             // Call trigger
-            $result=$this->call_trigger('BILL_UNPAYED',$user);
+            $result = $this->call_trigger('BILL_UNPAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
 		}
 		else
 		{
 			$error++;
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_print_error($this->db);
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2025,7 +2025,7 @@ 
 	 *	@param	string	$close_note		Comment
 	 *	@return int         			<0 if KO, >0 if OK
 	 */
-	function set_canceled($user,$close_code='',$close_note='')
+	function set_canceled($user, $close_code = '', $close_note = '')
 	{
 
 		dol_syslog(get_class($this)."::set_canceled rowid=".$this->id, LOG_DEBUG);
@@ -2033,10 +2033,10 @@ 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
-		$sql.= ' fk_statut='.self::STATUS_ABANDONED;
-		if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'";
-		if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
-		$sql.= ' WHERE rowid = '.$this->id;
+		$sql .= ' fk_statut='.self::STATUS_ABANDONED;
+		if ($close_code) $sql .= ", close_code='".$this->db->escape($close_code)."'";
+		if ($close_note) $sql .= ", close_note='".$this->db->escape($close_note)."'";
+		$sql .= ' WHERE rowid = '.$this->id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2044,14 +2044,14 @@ 
 			// On desaffecte de la facture les remises liees
 			// car elles n'ont pas ete utilisees vu que la facture est abandonnee.
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
-			$sql.= ' SET fk_facture = NULL';
-			$sql.= ' WHERE fk_facture = '.$this->id;
+			$sql .= ' SET fk_facture = NULL';
+			$sql .= ' WHERE fk_facture = '.$this->id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('BILL_CANCEL',$user);
+	            $result = $this->call_trigger('BILL_CANCEL', $user);
 	            if ($result < 0)
 	            {
 					$this->db->rollback();
@@ -2064,14 +2064,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error()." sql=".$sql;
+				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error()." sql=".$sql;
+			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -2;
 		}
@@ -2087,14 +2087,14 @@ 
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
 	 */
-	function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
+	function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$error=0;
+		$error = 0;
 		dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
 
 		// Force to have object complete for checks
@@ -2102,7 +2102,7 @@ 
 		$this->fetch_lines();
 
 		// Check parameters
-		if (! $this->brouillon)
+		if (!$this->brouillon)
 		{
 			dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
 			return 0;
@@ -2110,13 +2110,13 @@ 
 		if (count($this->lines) <= 0)
 		{
         	$langs->load("errors");
-			$this->error=$langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
+			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
 		}
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
 		{
-			$this->error='Permission denied';
+			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
 			return -1;
 		}
@@ -2129,36 +2129,36 @@ 
 			// Controle que facture source connue
 			if ($this->fk_facture_source <= 0)
 			{
-				$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("InvoiceReplacement"));
+				$this->error = $langs->trans("ErrorFieldRequired", $langs->trans("InvoiceReplacement"));
 				$this->db->rollback();
 				return -10;
 			}
 
 			// Charge la facture source a remplacer
-			$facreplaced=new Facture($this->db);
-			$result=$facreplaced->fetch($this->fk_facture_source);
+			$facreplaced = new Facture($this->db);
+			$result = $facreplaced->fetch($this->fk_facture_source);
 			if ($result <= 0)
 			{
-				$this->error=$langs->trans("ErrorBadInvoice");
+				$this->error = $langs->trans("ErrorBadInvoice");
 				$this->db->rollback();
 				return -11;
 			}
 
 			// Controle que facture source non deja remplacee par une autre
-			$idreplacement=$facreplaced->getIdReplacingInvoice('validated');
+			$idreplacement = $facreplaced->getIdReplacingInvoice('validated');
 			if ($idreplacement && $idreplacement != $this->id)
 			{
-				$facreplacement=new Facture($this->db);
+				$facreplacement = new Facture($this->db);
 				$facreplacement->fetch($idreplacement);
-				$this->error=$langs->trans("ErrorInvoiceAlreadyReplaced",$facreplaced->ref,$facreplacement->ref);
+				$this->error = $langs->trans("ErrorInvoiceAlreadyReplaced", $facreplaced->ref, $facreplacement->ref);
 				$this->db->rollback();
 				return -12;
 			}
 
-			$result=$facreplaced->set_canceled($user,'replaced','');
+			$result = $facreplaced->set_canceled($user, 'replaced', '');
 			if ($result < 0)
 			{
-				$this->error=$facreplaced->error;
+				$this->error = $facreplaced->error;
 				$this->db->rollback();
 				return -13;
 			}
@@ -2171,10 +2171,10 @@ 
 		}
 		else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		{
-			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
+			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
-				$this->date=dol_now();
-				$this->date_lim_reglement=$this->calculate_date_lim_reglement();
+				$this->date = dol_now();
+				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
 		}
@@ -2190,41 +2190,41 @@ 
 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-			$sql.= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
+			$sql .= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
-				$sql.= ", datef='".$this->db->idate($this->date)."'";
-				$sql.= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
+				$sql .= ", datef='".$this->db->idate($this->date)."'";
+				$sql .= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
 			}
-			$sql.= ' WHERE rowid = '.$this->id;
+			$sql .= ' WHERE rowid = '.$this->id;
 
 			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				dol_print_error($this->db);
 				$error++;
 			}
 
 			// On verifie si la facture etait une provisoire
-			if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref)))
+			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref)))
 			{
 				// La verif qu'une remise n'est pas utilisee 2 fois est faite au moment de l'insertion de ligne
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// Define third party as a customer
-				$result=$this->thirdparty->set_as_client();
+				$result = $this->thirdparty->set_as_client();
 
 				// Si active on decremente le produit principal et ses composants a la validation de facture
-				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0)
+				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0)
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 					$langs->load("agenda");
 
 					// Loop on each line
-					$cpt=count($this->lines);
+					$cpt = count($this->lines);
 					for ($i = 0; $i < $cpt; $i++)
 					{
 						if ($this->lines[$i]->fk_product > 0)
@@ -2232,8 +2232,8 @@ 
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
 							// We decrease stock for product
-							if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr",$num));
-							else $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
+							if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr", $num));
+							else $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr", $num));
 							if ($result < 0) {
 								$error++;
 							}
@@ -2243,15 +2243,15 @@ 
 			}
 
 			// Trigger calls
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
 	            // Call trigger
-	            $result=$this->call_trigger('BILL_VALIDATE',$user);
+	            $result = $this->call_trigger('BILL_VALIDATE', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->oldref = $this->ref;
 
@@ -2272,13 +2272,13 @@ 
 						{
 							dol_syslog("Rename ok");
 	                        // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
+	                        $listoffiles = dol_dir_list($conf->facture->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);
 	                        }
 						}
@@ -2286,22 +2286,22 @@ 
 				}
 			}
 
-			if (! $error && !$this->is_last_in_cycle())
+			if (!$error && !$this->is_last_in_cycle())
 			{
-				if (! $this->updatePriceNextInvoice($langs))
+				if (!$this->updatePriceNextInvoice($langs))
 				{
 					$error++;
 				}
 			}
 
 			// Set new ref and define current statut
-			if (! $error)
+			if (!$error)
 			{
 				$this->ref = $num;
-				$this->facnumber=$num;
-				$this->statut= self::STATUS_VALIDATED;
-				$this->brouillon=0;
-				$this->date_validation=$now;
+				$this->facnumber = $num;
+				$this->statut = self::STATUS_VALIDATED;
+				$this->brouillon = 0;
+				$this->date_validation = $now;
 				$i = 0;
 
                 if (!empty($conf->global->INVOICE_USE_SITUATION))
@@ -2323,7 +2323,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2381,11 +2381,11 @@ 
 	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function set_draft($user,$idwarehouse=-1)
+	function set_draft($user, $idwarehouse = -1)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
 		if ($this->statut == self::STATUS_DRAFT)
 		{
@@ -2396,20 +2396,20 @@ 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-		$sql.= " SET fk_statut = ".self::STATUS_DRAFT;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			// Si on decremente le produit principal et ses composants a la validation de facture, on réincrement
-			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
+			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
 					if ($this->lines[$i]->fk_product > 0)
@@ -2417,24 +2417,24 @@ 
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
-						else $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));	// we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
 					}
 				}
 			}
 
 			if ($error == 0)
 			{
-				$old_statut=$this->statut;
+				$old_statut = $this->statut;
 				$this->brouillon = 1;
 				$this->statut = self::STATUS_DRAFT;
 	            // Call trigger
-	            $result=$this->call_trigger('BILL_UNVALIDATE',$user);
+	            $result = $this->call_trigger('BILL_UNVALIDATE', $user);
 	            if ($result < 0)
 				{
 					$error++;
-					$this->statut=$old_statut;
-					$this->brouillon=0;
+					$this->statut = $old_statut;
+					$this->brouillon = 0;
 				}
 	            // End call triggers
 			} else {
@@ -2455,7 +2455,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -2500,11 +2500,11 @@ 
 	 * 		@param		double		$pu_ht_devise		Unit price in currency
 	 *    	@return    	int             				<0 if KO, Id of line if OK
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id='', $fk_unit = null, $pu_ht_devise = 0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = 0, $fk_remise_except = '', $price_base_type = 'HT', $pu_ttc = 0, $type = self::TYPE_STANDARD, $rang = -1, $special_code = 0, $origin = '', $origin_id = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $situation_percent = 100, $fk_prev_id = '', $fk_unit = null, $pu_ht_devise = 0)
 	{
 		// Deprecation warning
 		if ($label) {
-			dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
+			dol_syslog(__METHOD__.": using line label is deprecated", LOG_WARNING);
 		}
 
 		global $mysoc, $conf, $langs;
@@ -2513,63 +2513,63 @@ 
 		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($ventil)) $ventil=0;
-		if (empty($txtva)) $txtva=0;
-		if (empty($txlocaltax1)) $txlocaltax1=0;
-		if (empty($txlocaltax2)) $txlocaltax2=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($ventil)) $ventil = 0;
+		if (empty($txtva)) $txtva = 0;
+		if (empty($txlocaltax1)) $txlocaltax1 = 0;
+		if (empty($txlocaltax2)) $txlocaltax2 = 0;
+		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
 		if (empty($fk_prev_id)) $fk_prev_id = 'null';
-		if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+		if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
 
-		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+		$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 		// Clean vat code
-		$vat_src_code='';
+		$vat_src_code = '';
 		if (preg_match('/\((.*)\)/', $txtva, $reg))
 		{
 		    $vat_src_code = $reg[1];
-		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 		}
 
-		$remise_percent=price2num($remise_percent);
-		$qty=price2num($qty);
-		$pu_ht=price2num($pu_ht);
-		$pu_ttc=price2num($pu_ttc);
-		$pa_ht=price2num($pa_ht);
-		$txtva=price2num($txtva);
-		$txlocaltax1=price2num($txlocaltax1);
-		$txlocaltax2=price2num($txlocaltax2);
+		$remise_percent = price2num($remise_percent);
+		$qty = price2num($qty);
+		$pu_ht = price2num($pu_ht);
+		$pu_ttc = price2num($pu_ttc);
+		$pa_ht = price2num($pa_ht);
+		$txtva = price2num($txtva);
+		$txlocaltax1 = price2num($txlocaltax1);
+		$txlocaltax2 = price2num($txlocaltax2);
 
-		if ($price_base_type=='HT')
+		if ($price_base_type == 'HT')
 		{
-			$pu=$pu_ht;
+			$pu = $pu_ht;
 		}
 		else
 		{
-			$pu=$pu_ttc;
+			$pu = $pu_ttc;
 		}
 
 		// Check parameters
 		if ($type < 0) return -1;
 
-		if (! empty($this->brouillon))
+		if (!empty($this->brouillon))
 		{
 			$this->db->begin();
 
-			$product_type=$type;
+			$product_type = $type;
 			if (!empty($fk_product))
 			{
-				$product=new Product($this->db);
-				$result=$product->fetch($fk_product);
-				$product_type=$product->type;
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
 
-				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
                     $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -2590,7 +2590,7 @@ 
 			$pu_ht = $tabprice[3];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
@@ -2604,72 +2604,72 @@ 
 			}
 
 			// Insert line
-			$this->line=new FactureLigne($this->db);
+			$this->line = new FactureLigne($this->db);
 
 			$this->line->context = $this->context;
 
-			$this->line->fk_facture=$this->id;
-			$this->line->label=$label;	// deprecated
-			$this->line->desc=$desc;
+			$this->line->fk_facture = $this->id;
+			$this->line->label = $label; // deprecated
+			$this->line->desc = $desc;
 
-			$this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	    // For credit note, quantity is always positive and unit price negative
-			$this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
+			$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
+			$this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
 
-			$this->line->vat_src_code=$vat_src_code;
-			$this->line->tva_tx=$txtva;
-			$this->line->localtax1_tx=$txlocaltax1;
-			$this->line->localtax2_tx=$txlocaltax2;
+			$this->line->vat_src_code = $vat_src_code;
+			$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->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);    // For credit note and if qty is negative, total is negative
-			$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);  // For credit note and if qty is negative, total is negative
-			$this->line->total_tva=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);  // For credit note and if qty is negative, total is negative
-			$this->line->total_localtax1=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax1):$total_localtax1);  // For credit note and if qty is negative, total is negative
-			$this->line->total_localtax2=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax2):$total_localtax2);  // For credit note and if qty is negative, total is negative
-
-			$this->line->fk_product=$fk_product;
-			$this->line->product_type=$product_type;
-			$this->line->remise_percent=$remise_percent;
-			$this->line->date_start=$date_start;
-			$this->line->date_end=$date_end;
-			$this->line->ventil=$ventil;
-			$this->line->rang=$rangtouse;
-			$this->line->info_bits=$info_bits;
-			$this->line->fk_remise_except=$fk_remise_except;
-
-			$this->line->special_code=$special_code;
-			$this->line->fk_parent_line=$fk_parent_line;
-			$this->line->origin=$origin;
-			$this->line->origin_id=$origin_id;
+			$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
+			$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
+			$this->line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative
+			$this->line->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative
+			$this->line->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative
+
+			$this->line->fk_product = $fk_product;
+			$this->line->product_type = $product_type;
+			$this->line->remise_percent = $remise_percent;
+			$this->line->date_start = $date_start;
+			$this->line->date_end = $date_end;
+			$this->line->ventil = $ventil;
+			$this->line->rang = $rangtouse;
+			$this->line->info_bits = $info_bits;
+			$this->line->fk_remise_except = $fk_remise_except;
+
+			$this->line->special_code = $special_code;
+			$this->line->fk_parent_line = $fk_parent_line;
+			$this->line->origin = $origin;
+			$this->line->origin_id = $origin_id;
 			$this->line->situation_percent = $situation_percent;
 			$this->line->fk_prev_id = $fk_prev_id;
-			$this->line->fk_unit=$fk_unit;
+			$this->line->fk_unit = $fk_unit;
 
 			// infos marge
 			$this->line->fk_fournprice = $fk_fournprice;
 			$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		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_options;
+			if (is_array($array_options) && count($array_options) > 0) {
+				$this->line->array_options = $array_options;
 			}
 
-			$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 facture meme
-				$result=$this->update_price(1,'auto',0,$mysoc);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+				$result = $this->update_price(1, 'auto', 0, $mysoc); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
 				if ($result > 0)
 				{
 					$this->db->commit();
@@ -2677,14 +2677,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;
 			}
@@ -2720,17 +2720,17 @@ 
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=100, $fk_unit = null, $pu_ht_devise = 0, $notrigger=0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
 	{
-		global $conf,$user;
+		global $conf, $user;
 		// Deprecation warning
 		if ($label) {
-			dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
+			dol_syslog(__METHOD__.": using line label is deprecated", LOG_WARNING);
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		global $mysoc,$langs;
+		global $mysoc, $langs;
 
 		dol_syslog(get_class($this)."::updateline rowid=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, date_start=$date_start, date_end=$date_end, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, type=$type, fk_parent_line=$fk_parent_line pa_ht=$pa_ht, special_code=$special_code fk_unit=$fk_unit", LOG_DEBUG);
 
@@ -2740,7 +2740,7 @@ 
 			{
 				if (!$this->checkProgressLine($rowid, $situation_percent))
 				{
-					if (!$this->error) $this->error=$langs->trans('invoiceLineProgressError');
+					if (!$this->error) $this->error = $langs->trans('invoiceLineProgressError');
 					return -3;
 				}
 			}
@@ -2748,12 +2748,12 @@ 
 			$this->db->begin();
 
 			// Clean parameters
-			if (empty($qty)) $qty=0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-			if (empty($special_code) || $special_code == 3) $special_code=0;
-			if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+			if (empty($qty)) $qty = 0;
+			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
+			if (empty($special_code) || $special_code == 3) $special_code = 0;
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
 
-			$remise_percent	= price2num($remise_percent);
+			$remise_percent = price2num($remise_percent);
 			$qty			= price2num($qty);
 			$pu 			= price2num($pu);
 			$pa_ht			= price2num($pa_ht);
@@ -2768,29 +2768,29 @@ 
 			// 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);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			// Clean vat code
-    		$vat_src_code='';
+    		$vat_src_code = '';
     		if (preg_match('/\((.*)\)/', $txtva, $reg))
     		{
     		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+    		    $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, $mysoc, $localtaxes_type, $situation_percent, $this->multicurrency_tx, $pu_ht_devise);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, $situation_percent, $this->multicurrency_tx, $pu_ht_devise);
 
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
-			$total_localtax1=$tabprice[9];
-			$total_localtax2=$tabprice[10];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 			$pu_ht  = $tabprice[3];
 			$pu_tva = $tabprice[4];
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
@@ -2800,10 +2800,10 @@ 
 			$remise = 0;
 			if ($remise_percent > 0)
 			{
-				$remise = round(($pu * $remise_percent / 100),2);
+				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = ($pu - $remise);
 			}
-			$price    = price2num($price);
+			$price = price2num($price);
 
 			//Fetch current line from the database and then clone the object and set it in $oldline property
 			$line = new FactureLigne($this->db);
@@ -2811,13 +2811,13 @@ 
 
 			if (!empty($line->fk_product))
 			{
-				$product=new Product($this->db);
-				$result=$product->fetch($line->fk_product);
-				$product_type=$product->type;
+				$product = new Product($this->db);
+				$result = $product->fetch($line->fk_product);
+				$product_type = $product->type;
 
-				if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
                     $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -2830,7 +2830,7 @@ 
             $this->line->context = $this->context;
 
 			// 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;
@@ -2838,32 +2838,32 @@ 
 
 			$this->line->rowid				= $rowid;
 			$this->line->label				= $label;
-			$this->line->desc				= $desc;
-			$this->line->qty				= ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
+			$this->line->desc = $desc;
+			$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
 
-			$this->line->vat_src_code       = $vat_src_code;
-			$this->line->tva_tx				= $txtva;
+			$this->line->vat_src_code = $vat_src_code;
+			$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			= ($this->type==2?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
-			$this->line->date_start			= $date_start;
+			$this->line->subprice			= ($this->type == 2 ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+			$this->line->date_start = $date_start;
 			$this->line->date_end			= $date_end;
-			$this->line->total_ht			= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
-			$this->line->total_tva			= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);
+			$this->line->total_ht			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
+			$this->line->total_tva			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva);
 			$this->line->total_localtax1	= $total_localtax1;
 			$this->line->total_localtax2	= $total_localtax2;
-			$this->line->total_ttc			= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
+			$this->line->total_ttc			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc);
 			$this->line->info_bits			= $info_bits;
 			$this->line->special_code		= $special_code;
 			$this->line->product_type		= $type;
-			$this->line->fk_parent_line		= $fk_parent_line;
-			$this->line->skip_update_total	= $skip_update_total;
-			$this->line->situation_percent  = $situation_percent;
-			$this->line->fk_unit				= $fk_unit;
+			$this->line->fk_parent_line = $fk_parent_line;
+			$this->line->skip_update_total = $skip_update_total;
+			$this->line->situation_percent = $situation_percent;
+			$this->line->fk_unit = $fk_unit;
 
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
@@ -2874,15 +2874,15 @@ 
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_options;
+			if (is_array($array_options) && count($array_options) > 0) {
+				$this->line->array_options = $array_options;
 			}
 
-			$result=$this->line->update($user, $notrigger);
+			$result = $this->line->update($user, $notrigger);
 			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 info denormalisees au niveau facture
 				$this->update_price(1);
@@ -2891,14 +2891,14 @@ 
 			}
 			else
 			{
-			    $this->error=$this->line->error;
+			    $this->error = $this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error="Invoice statut makes operation forbidden";
+			$this->error = "Invoice statut makes operation forbidden";
 			return -2;
 		}
 	}
@@ -2918,9 +2918,9 @@ 
 				AND f.fk_statut <> 0';
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return false;
 		}
 
@@ -2939,9 +2939,9 @@ 
 	 */
 	function update_percent($line, $percent)
 	{
-	    global $mysoc,$user;
+	    global $mysoc, $user;
 
-		include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php');
+		include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
 
 		// Cap percentages to 100
 		if ($percent > 100) $percent = 100;
@@ -2969,9 +2969,9 @@ 
 
 		dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
 
-		if (! $this->brouillon)
+		if (!$this->brouillon)
 		{
-			$this->error='ErrorBadStatus';
+			$this->error = 'ErrorBadStatus';
 			return -1;
 		}
 
@@ -2979,29 +2979,29 @@ 
 
 		// Libere remise liee a ligne de facture
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
-		$sql.= ' SET fk_facture_line = NULL';
-		$sql.= ' WHERE fk_facture_line = '.$rowid;
+		$sql .= ' SET fk_facture_line = NULL';
+		$sql .= ' WHERE fk_facture_line = '.$rowid;
 
 		dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
 
-		$line=new FactureLigne($this->db);
+		$line = new FactureLigne($this->db);
 
         $line->context = $this->context;
 
 		// For triggers
 		$result = $line->fetch($rowid);
-		if (! ($result > 0)) dol_print_error($db, $line->error, $line->errors);
+		if (!($result > 0)) dol_print_error($db, $line->error, $line->errors);
 
 		if ($line->delete($user) > 0)
 		{
-			$result=$this->update_price(1);
+			$result = $this->update_price(1);
 
 			if ($result > 0)
 			{
@@ -3011,14 +3011,14 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
 		else
 		{
 			$this->db->rollback();
-			$this->error=$line->error;
+			$this->error = $line->error;
 			return -1;
 		}
 	}
@@ -3031,41 +3031,41 @@ 
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 		<0 if ko, >0 if ok
 	 */
-	function set_remise($user, $remise, $notrigger=0)
+	function set_remise($user, $remise, $notrigger = 0)
 	{
 		// Clean parameters
-		if (empty($remise)) $remise=0;
+		if (empty($remise)) $remise = 0;
 
 		if ($user->rights->facture->creer)
 		{
-			$remise=price2num($remise);
+			$remise = price2num($remise);
 
-			$error=0;
+			$error = 0;
 
 			$this->db->begin();
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-			$sql.= ' SET remise_percent = '.$remise;
-			$sql.= ' WHERE rowid = '.$this->id;
-			$sql.= ' AND fk_statut = '.self::STATUS_DRAFT;
+			$sql .= ' SET remise_percent = '.$remise;
+			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= ' AND fk_statut = '.self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if (!$resql)
 			{
-				$this->errors[]=$this->db->error();
+				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (! $notrigger && empty($error))
+			if (!$notrigger && empty($error))
 			{
 				// Call trigger
-				$result=$this->call_trigger('BILL_MODIFY',$user);
+				$result = $this->call_trigger('BILL_MODIFY', $user);
 				if ($result < 0) $error++;
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->remise_percent = $remise;
 				$this->update_price(1);
@@ -3075,13 +3075,13 @@ 
 			}
 			else
 			{
-				foreach($this->errors as $errmsg)
+				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-					$this->error.=($this->error?', '.$errmsg:$errmsg);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
 				$this->db->rollback();
-				return -1*$error;
+				return -1 * $error;
 			}
 		}
 	}
@@ -3095,60 +3095,60 @@ 
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 				<0 if KO, >0 if OK
 	 */
-	function set_remise_absolue($user, $remise, $notrigger=0)
+	function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
-		if (empty($remise)) $remise=0;
+		if (empty($remise)) $remise = 0;
 
 		if ($user->rights->facture->creer)
 		{
-			$error=0;
+			$error = 0;
 
 			$this->db->begin();
 
-			$remise=price2num($remise);
+			$remise = price2num($remise);
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-			$sql.= ' SET remise_absolue = '.$remise;
-			$sql.= ' WHERE rowid = '.$this->id;
-			$sql.= ' AND fk_statut = '.self::STATUS_DRAFT;
+			$sql .= ' SET remise_absolue = '.$remise;
+			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= ' AND fk_statut = '.self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if (!$resql)
 			{
-				$this->errors[]=$this->db->error();
+				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
-				$this->oldcopy= clone $this;
+				$this->oldcopy = clone $this;
 				$this->remise_absolue = $remise;
 				$this->update_price(1);
 			}
 
-			if (! $notrigger && empty($error))
+			if (!$notrigger && empty($error))
 			{
 				// Call trigger
-				$result=$this->call_trigger('BILL_MODIFY',$user);
+				$result = $this->call_trigger('BILL_MODIFY', $user);
 				if ($result < 0) $error++;
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
 			}
 			else
 			{
-				foreach($this->errors as $errmsg)
+				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-					$this->error.=($this->error?', '.$errmsg:$errmsg);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
 				$this->db->rollback();
-				return -1*$error;
+				return -1 * $error;
 			}
 		}
 	}
@@ -3159,41 +3159,41 @@ 
 	 *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
 	 *  @return     array					Array with list of payments
 	 */
-	function getListOfPayments($filtertype='')
+	function getListOfPayments($filtertype = '')
 	{
-		$retarray=array();
+		$retarray = array();
 
-		$table='paiement_facture';
-		$table2='paiement';
-		$field='fk_facture';
-		$field2='fk_paiement';
+		$table = 'paiement_facture';
+		$table2 = 'paiement';
+		$field = 'fk_facture';
+		$field2 = 'fk_paiement';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$table='paiementfourn_facturefourn';
-			$table2='paiementfourn';
-			$field='fk_facturefourn';
-			$field2='fk_paiementfourn';
+			$table = 'paiementfourn_facturefourn';
+			$table2 = 'paiementfourn';
+			$field = 'fk_facturefourn';
+			$field2 = 'fk_paiementfourn';
 		}
 
 		$sql = 'SELECT pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
-		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
+		$sql .= ' WHERE pf.'.$field.' = '.$this->id;
 		//$sql.= ' WHERE pf.'.$field.' = 1';
-		$sql.= ' AND pf.'.$field2.' = p.rowid';
-		$sql.= ' AND p.fk_paiement = t.id';
-		$sql.= ' AND t.entity IN (' . getEntity('c_paiement').')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
+		$sql .= ' AND pf.'.$field2.' = p.rowid';
+		$sql .= ' AND p.fk_paiement = t.id';
+		$sql .= ' AND t.entity IN ('.getEntity('c_paiement').')';
+		if ($filtertype) $sql .= " AND t.code='PRE'";
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num);
+				$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -3201,7 +3201,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
 		}
@@ -3216,21 +3216,21 @@ 
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-	function getNextNumRef($soc,$mode='next')
+	function getNextNumRef($soc, $mode = 'next')
 	{
 		global $conf, $langs;
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON='mod_facture_terre';
-		else if ($conf->global->FACTURE_ADDON=='terre') $conf->global->FACTURE_ADDON='mod_facture_terre';
-		else if ($conf->global->FACTURE_ADDON=='mercure') $conf->global->FACTURE_ADDON='mod_facture_mercure';
+		if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON = 'mod_facture_terre';
+		else if ($conf->global->FACTURE_ADDON == 'terre') $conf->global->FACTURE_ADDON = 'mod_facture_terre';
+		else if ($conf->global->FACTURE_ADDON == 'mercure') $conf->global->FACTURE_ADDON = 'mod_facture_mercure';
 
-		if (! empty($conf->global->FACTURE_ADDON))
+		if (!empty($conf->global->FACTURE_ADDON))
 		{
 			dol_syslog("Call getNextNumRef with FACTURE_ADDON = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->nom.", type=".$soc->typent_code, LOG_DEBUG);
 
-			$mybool=false;
+			$mybool = false;
 
 			$file = $conf->global->FACTURE_ADDON.".php";
 			$classname = $conf->global->FACTURE_ADDON;
@@ -3245,16 +3245,16 @@ 
 				// Load file with numbering class (if found)
 				if (is_file($dir.$file) && is_readable($dir.$file))
 				{
-                    $mybool |= include_once $dir . $file;
+                    $mybool |= include_once $dir.$file;
                 }
 			}
 
 			// For compatibility
-			if (! $mybool)
+			if (!$mybool)
 			{
 				$file = $conf->global->FACTURE_ADDON."/".$conf->global->FACTURE_ADDON.".modules.php";
 				$classname = "mod_facture_".$conf->global->FACTURE_ADDON;
-				$classname = preg_replace('/\-.*$/','',$classname);
+				$classname = preg_replace('/\-.*$/', '', $classname);
 				// Include file with class
 				foreach ($conf->file->dol_document_root as $dirroot)
 				{
@@ -3262,27 +3262,27 @@ 
 
 					// Load file with numbering class (if found)
 					if (is_file($dir.$file) && is_readable($dir.$file)) {
-                        $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,$mode);
+			$numref = $obj->getNextValue($soc, $this, $mode);
 
 			/**
 			 * $numref can be empty in case we ask for the last value because if there is no invoice created with the
 			 * set up mask.
 			 */
 			if ($mode != 'last' && !$numref) {
-				$this->error=$obj->error;
+				$this->error = $obj->error;
 				//dol_print_error($this->db,"Facture::getNextNumRef ".$obj->error);
 				return "";
 			}
@@ -3306,11 +3306,11 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT c.rowid, datec, date_valid as datev, tms as datem,';
-		$sql.= ' fk_user_author, fk_user_valid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as c';
-		$sql.= ' WHERE c.rowid = '.$id;
+		$sql .= ' fk_user_author, fk_user_valid';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as c';
+		$sql .= ' WHERE c.rowid = '.$id;
 
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -3321,7 +3321,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 				if ($obj->fk_user_valid)
 				{
@@ -3331,7 +3331,7 @@ 
 				}
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);	// Should be in log table
+				$this->date_validation   = $this->db->jdate($obj->datev); // Should be in log table
 			}
 			$this->db->free($result);
 		}
@@ -3349,11 +3349,11 @@ 
 	function getVentilExportCompta()
 	{
 		// On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
-		$ventilExportCompta = 0 ;
-		$num=count($this->lines);
+		$ventilExportCompta = 0;
+		$num = count($this->lines);
 		for ($i = 0; $i < $num; $i++)
 		{
-			if (! empty($this->lines[$i]->export_compta) && ! empty($this->lines[$i]->code_ventilation))
+			if (!empty($this->lines[$i]->export_compta) && !empty($this->lines[$i]->code_ventilation))
 			{
 				$ventilExportCompta++;
 			}
@@ -3391,8 +3391,8 @@ 
 			return 1;
 		}
 
-		if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 2;
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED))  return 0;
+		if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 2;
+		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED))  return 0;
 
 		// TODO Test if there is at least one payment. If yes, refuse to delete.
 		// ...
@@ -3403,7 +3403,7 @@ 
 			// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
 			if (empty($this->thirdparty)) $this->fetch_thirdparty();
 
-			$maxfacnumber = $this->getNextNumRef($this->thirdparty,'last');
+			$maxfacnumber = $this->getNextNumRef($this->thirdparty, 'last');
 			$ventilExportCompta = $this->getVentilExportCompta();
 
 			// If there is no invoice into the reset range and not already dispatched, we can delete
@@ -3434,30 +3434,30 @@ 
 	 *  @param    	string	$sortorder		Sort order
 	 *  @return     int             		-1 if KO, array with result if OK
 	 */
-	function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='f.datef,f.rowid', $sortorder='DESC')
+	function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
 	{
-		global $conf,$user;
+		global $conf, $user;
 
 		$ga = array();
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
-		$sql.= " f.rowid as fid, f.facnumber as ref, f.datef as df";
-		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."facture as f";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) //restriction
+		$sql .= " f.rowid as fid, f.facnumber as ref, f.datef as df";
+		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."facture as f";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " AND f.fk_soc = s.rowid";
+		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 f.fk_statut = ".self::STATUS_DRAFT;
-		if (is_object($excluser)) $sql.= " AND f.fk_user_author <> ".$excluser->id;
-		$sql.= $this->db->order($sortfield,$sortorder);
-		$sql.= $this->db->plimit($limit,$offset);
+		if ($socid) $sql .= " AND s.rowid = ".$socid;
+		if ($draft) $sql .= " AND f.fk_statut = ".self::STATUS_DRAFT;
+		if (is_object($excluser)) $sql .= " AND f.fk_user_author <> ".$excluser->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)
 		{
 			$numc = $this->db->num_rows($result);
@@ -3478,7 +3478,7 @@ 
 					}
 					else
 					{
-						$ga[$i]['id']	= $obj->fid;
+						$ga[$i]['id'] = $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
 					}
@@ -3502,32 +3502,32 @@ 
 	 *	@param		int		$socid		Id societe
 	 *	@return    	array				Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 */
-	function list_replacable_invoices($socid=0)
+	function list_replacable_invoices($socid = 0)
 	{
 		global $conf;
 
 		$return = array();
 
 		$sql = "SELECT f.rowid as rowid, f.facnumber, f.fk_statut,";
-		$sql.= " ff.rowid as rowidnext";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON f.rowid = ff.fk_facture_source";
-		$sql.= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))";
-		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= " AND f.paye = 0";					// Pas classee payee completement
-		$sql.= " AND pf.fk_paiement IS NULL";		// Aucun paiement deja fait
-		$sql.= " AND ff.fk_statut IS NULL";			// Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
-		$sql.= " ORDER BY f.facnumber";
+		$sql .= " ff.rowid as rowidnext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON f.rowid = ff.fk_facture_source";
+		$sql .= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))";
+		$sql .= " AND f.entity = ".$conf->entity;
+		$sql .= " AND f.paye = 0"; // Pas classee payee completement
+		$sql .= " AND pf.fk_paiement IS NULL"; // Aucun paiement deja fait
+		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
+		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " ORDER BY f.facnumber";
 
 		dol_syslog(get_class($this)."::list_replacable_invoices", 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))
 			{
-				$return[$obj->rowid]=array(	'id' => $obj->rowid,
+				$return[$obj->rowid] = array('id' => $obj->rowid,
 				'ref' => $obj->facnumber,
 				'status' => $obj->fk_statut);
 			}
@@ -3536,7 +3536,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3550,40 +3550,40 @@ 
 	 *	@param		int		$socid		Id societe
 	 *	@return    	array				Tableau des factures ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 */
-	function list_qualified_avoir_invoices($socid=0)
+	function list_qualified_avoir_invoices($socid = 0)
 	{
 		global $conf;
 
 		$return = array();
 
 		$sql = "SELECT f.rowid as rowid, f.facnumber, f.fk_statut, f.type, f.paye, pf.fk_paiement";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON (f.rowid = ff.fk_facture_source AND ff.type=".self::TYPE_REPLACEMENT.")";
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON (f.rowid = ff.fk_facture_source AND ff.type=".self::TYPE_REPLACEMENT.")";
+		$sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
 		//  $sql.= " WHERE f.fk_statut >= 1";
 		//	$sql.= " AND (f.paye = 1";				// Classee payee completement
 		//	$sql.= " OR f.close_code IS NOT NULL)";	// Classee payee partiellement
-		$sql.= " AND ff.type IS NULL";			// Renvoi vrai si pas facture de remplacement
-		$sql.= " AND f.type != ".self::TYPE_CREDIT_NOTE;				// Type non 2 si facture non avoir
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
-		$sql.= " ORDER BY f.facnumber";
+		$sql .= " AND ff.type IS NULL"; // Renvoi vrai si pas facture de remplacement
+		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
+		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " ORDER BY f.facnumber";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_invoices", 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))
 			{
-				$qualified=0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified=1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified=1;
+				$qualified = 0;
+				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified = 1;
+				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified = 1;
 				if ($qualified)
 				{
 					//$ref=$obj->facnumber;
-					$paymentornot=($obj->fk_paiement?1:0);
-					$return[$obj->rowid]=array('ref'=>$obj->facnumber,'status'=>$obj->fk_statut,'type'=>$obj->type,'paye'=>$obj->paye,'paymentornot'=>$paymentornot);
+					$paymentornot = ($obj->fk_paiement ? 1 : 0);
+					$return[$obj->rowid] = array('ref'=>$obj->facnumber, 'status'=>$obj->fk_statut, 'type'=>$obj->type, 'paye'=>$obj->paye, 'paymentornot'=>$paymentornot);
 				}
 			}
 
@@ -3591,7 +3591,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3605,34 +3605,34 @@ 
 	 *  @param		float	$amount		Amount we request direct debit for
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-	function demande_prelevement($fuser, $amount=0)
+	function demande_prelevement($fuser, $amount = 0)
 	{
 
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 
 		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0)
 		{
-	        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+	        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 	        $bac = new CompanyBankAccount($this->db);
-	        $bac->fetch(0,$this->socid);
+	        $bac->fetch(0, $this->socid);
 
         	$sql = 'SELECT count(*)';
-			$sql.= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
-			$sql.= ' WHERE fk_facture = '.$this->id;
-			$sql.= ' AND traite = 0';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
+			$sql .= ' WHERE fk_facture = '.$this->id;
+			$sql .= ' AND traite = 0';
 
 			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$row = $this->db->fetch_row($resql);
 				if ($row[0] == 0)
 				{
-					$now=dol_now();
+					$now = dol_now();
 
-                    $totalpaye  = $this->getSommePaiement();
+                    $totalpaye = $this->getSommePaiement();
                     $totalcreditnotes = $this->getSumCreditNotesUsed();
                     $totaldeposits = $this->getSumDepositsUsed();
                     //print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
@@ -3641,7 +3641,7 @@ 
                     // For example print 239.2 - 229.3 - 9.9; does not return 0.
                     //$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
                     //$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
+					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
 					if (is_numeric($amount) && $amount != 0)
 					{
@@ -3657,28 +3657,28 @@ 
 						$sql .= ",'".$bac->cle_rib."')";
 
 						dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
-						$resql=$this->db->query($sql);
-						if (! $resql)
+						$resql = $this->db->query($sql);
+						if (!$resql)
 						{
-						    $this->error=$this->db->lasterror();
+						    $this->error = $this->db->lasterror();
 						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
 						    $error++;
 						}
 					}
 					else
 					{
-						$this->error='WithdrawRequestErrorNilAmount';
+						$this->error = 'WithdrawRequestErrorNilAmount';
 	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
 	                    $error++;
 					}
 
-        			if (! $error)
+        			if (!$error)
         			{
         				// Force payment mode of invoice to withdraw
         				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
         				if ($payment_mode_id > 0)
         				{
-        					$result=$this->setPaymentMethods($payment_mode_id);
+        					$result = $this->setPaymentMethods($payment_mode_id);
         				}
         			}
 
@@ -3687,21 +3687,21 @@ 
                 }
                 else
                 {
-                    $this->error="A request already exists";
+                    $this->error = "A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
                     return 0;
                 }
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
                 return -2;
             }
         }
         else
         {
-            $this->error="Status of invoice does not allow this";
+            $this->error = "Status of invoice does not allow this";
             dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
             return -3;
         }
@@ -3719,13 +3719,13 @@ 
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
 		$sql .= ' WHERE rowid = '.$did;
 		$sql .= ' AND traite = 0';
-		if ( $this->db->query($sql) )
+		if ($this->db->query($sql))
 		{
 			return 0;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error);
 			return -1;
 		}
@@ -3745,33 +3745,33 @@ 
 		$clause = " WHERE";
 
 		$sql = "SELECT f.rowid, f.date_lim_reglement as datefin,f.fk_statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
-			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";
 		}
-		$sql.= $clause." f.paye=0";
-		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_statut = ".self::STATUS_VALIDATED;
-		if ($user->societe_id) $sql.= " AND f.fk_soc = ".$user->societe_id;
+		$sql .= $clause." f.paye=0";
+		$sql .= " AND f.entity = ".$conf->entity;
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;
+		if ($user->societe_id) $sql .= " AND f.fk_soc = ".$user->societe_id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$langs->load("bills");
-			$now=dol_now();
+			$now = dol_now();
 
 			$response = new WorkboardResponse();
-			$response->warning_delay=$conf->facture->client->warning_delay/60/60/24;
-			$response->label=$langs->trans("CustomerBillsUnpaid");
-			$response->url=DOL_URL_ROOT.'/compta/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=customers_bills';
-			$response->img=img_object('',"bill");
+			$response->warning_delay = $conf->facture->client->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("CustomerBillsUnpaid");
+			$response->url = DOL_URL_ROOT.'/compta/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=customers_bills';
+			$response->img = img_object('', "bill");
 
 			$generic_facture = new Facture($this->db);
 
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$generic_facture->date_lim_reglement = $this->db->jdate($obj->datefin);
 				$generic_facture->statut = $obj->fk_statut;
@@ -3788,7 +3788,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3803,7 +3803,7 @@ 
 	 */
 	function getIdBillingContact()
 	{
-		return $this->getIdContact('external','BILLING');
+		return $this->getIdContact('external', 'BILLING');
 	}
 
 	/**
@@ -3813,7 +3813,7 @@ 
 	 */
 	function getIdShippingContact()
 	{
-		return $this->getIdContact('external','SHIPPING');
+		return $this->getIdContact('external', 'SHIPPING');
 	}
 
 
@@ -3825,20 +3825,20 @@ 
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-	function initAsSpecimen($option='')
+	function initAsSpecimen($option = '')
 	{
 		global $langs;
 
-		$now=dol_now();
-		$arraynow=dol_getdate($now);
-		$nownotime=dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
+		$now = dol_now();
+		$arraynow = dol_getdate($now);
+		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
 
         // 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)
 		{
@@ -3853,26 +3853,26 @@ 
 		}
 		//Avoid php warning Warning: mt_rand(): max(0) is smaller than min(1) when no product exists
 		if (empty($num_prods)) {
-			$num_prods=1;
+			$num_prods = 1;
 		}
 
 		// Initialize parameters
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->socid = 1;
 		$this->date = $nownotime;
-		$this->date_lim_reglement = $nownotime + 3600 * 24 *30;
+		$this->date_lim_reglement = $nownotime + 3600 * 24 * 30;
 		$this->cond_reglement_id   = 1;
 		$this->cond_reglement_code = 'RECEP';
-		$this->date_lim_reglement=$this->calculate_date_lim_reglement();
-		$this->mode_reglement_id   = 0;		// Not forced to show payment mode CHQ + VIR
-		$this->mode_reglement_code = '';	// Not forced to show payment mode CHQ + VIR
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
-		$this->note='This is a comment (private)';
-		$this->fk_incoterms=0;
-		$this->location_incoterms='';
+		$this->date_lim_reglement = $this->calculate_date_lim_reglement();
+		$this->mode_reglement_id   = 0; // Not forced to show payment mode CHQ + VIR
+		$this->mode_reglement_code = ''; // Not forced to show payment mode CHQ + VIR
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+		$this->note = 'This is a comment (private)';
+		$this->fk_incoterms = 0;
+		$this->location_incoterms = '';
 
 		if (empty($option) || $option != 'nolines')
 		{
@@ -3881,63 +3881,63 @@ 
 			$xnbp = 0;
 			while ($xnbp < $nbp)
 			{
-				$line=new FactureLigne($this->db);
-				$line->desc=$langs->trans("Description")." ".$xnbp;
-				$line->qty=1;
-				$line->subprice=100;
-				$line->tva_tx=19.6;
-				$line->localtax1_tx=0;
-				$line->localtax2_tx=0;
-				$line->remise_percent=0;
+				$line = new FactureLigne($this->db);
+				$line->desc = $langs->trans("Description")." ".$xnbp;
+				$line->qty = 1;
+				$line->subprice = 100;
+				$line->tva_tx = 19.6;
+				$line->localtax1_tx = 0;
+				$line->localtax2_tx = 0;
+				$line->remise_percent = 0;
 				if ($xnbp == 1)        // Qty is negative (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
-					$line->fk_product=$prodids[$prodid];
-					$line->qty=-1;
-					$line->total_ht=-100;
-					$line->total_ttc=-119.6;
-					$line->total_tva=-19.6;
-					$line->multicurrency_total_ht=-200;
-					$line->multicurrency_total_ttc=-239.2;
-					$line->multicurrency_total_tva=-39.2;
+					$line->fk_product = $prodids[$prodid];
+					$line->qty = -1;
+					$line->total_ht = -100;
+					$line->total_ttc = -119.6;
+					$line->total_tva = -19.6;
+					$line->multicurrency_total_ht = -200;
+					$line->multicurrency_total_ttc = -239.2;
+					$line->multicurrency_total_tva = -39.2;
 				}
 				else if ($xnbp == 2)    // UP is negative (free line)
 				{
-					$line->subprice=-100;
-					$line->total_ht=-100;
-					$line->total_ttc=-119.6;
-					$line->total_tva=-19.6;
-					$line->remise_percent=0;
-					$line->multicurrency_total_ht=-200;
-					$line->multicurrency_total_ttc=-239.2;
-					$line->multicurrency_total_tva=-39.2;
+					$line->subprice = -100;
+					$line->total_ht = -100;
+					$line->total_ttc = -119.6;
+					$line->total_tva = -19.6;
+					$line->remise_percent = 0;
+					$line->multicurrency_total_ht = -200;
+					$line->multicurrency_total_ttc = -239.2;
+					$line->multicurrency_total_tva = -39.2;
 				}
 				else if ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
-					$line->fk_product=$prodids[$prodid];
-					$line->total_ht=50;
-					$line->total_ttc=59.8;
-					$line->total_tva=9.8;
-					$line->multicurrency_total_ht=100;
-					$line->multicurrency_total_ttc=119.6;
-					$line->multicurrency_total_tva=19.6;
-					$line->remise_percent=50;
+					$line->fk_product = $prodids[$prodid];
+					$line->total_ht = 50;
+					$line->total_ttc = 59.8;
+					$line->total_tva = 9.8;
+					$line->multicurrency_total_ht = 100;
+					$line->multicurrency_total_ttc = 119.6;
+					$line->multicurrency_total_tva = 19.6;
+					$line->remise_percent = 50;
 				}
 				else    // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
-					$line->fk_product=$prodids[$prodid];
-					$line->total_ht=100;
-					$line->total_ttc=119.6;
-					$line->total_tva=19.6;
-					$line->multicurrency_total_ht=200;
-					$line->multicurrency_total_ttc=239.2;
-					$line->multicurrency_total_tva=39.2;
-					$line->remise_percent=0;
+					$line->fk_product = $prodids[$prodid];
+					$line->total_ht = 100;
+					$line->total_ttc = 119.6;
+					$line->total_tva = 19.6;
+					$line->multicurrency_total_ht = 200;
+					$line->multicurrency_total_ttc = 239.2;
+					$line->multicurrency_total_tva = 39.2;
+					$line->remise_percent = 0;
 				}
 
-				$this->lines[$xnbp]=$line;
+				$this->lines[$xnbp] = $line;
 
 
 				$this->total_ht       += $line->total_ht;
@@ -3953,24 +3953,24 @@ 
 			$this->revenuestamp = 0;
 
 			// Add a line "offered"
-			$line=new FactureLigne($this->db);
-			$line->desc=$langs->trans("Description")." (offered line)";
-			$line->qty=1;
-			$line->subprice=100;
-			$line->tva_tx=19.6;
-			$line->localtax1_tx=0;
-			$line->localtax2_tx=0;
-			$line->remise_percent=100;
-			$line->total_ht=0;
-			$line->total_ttc=0;    // 90 * 1.196
-			$line->total_tva=0;
-			$line->multicurrency_total_ht=0;
-			$line->multicurrency_total_ttc=0;
-			$line->multicurrency_total_tva=0;
+			$line = new FactureLigne($this->db);
+			$line->desc = $langs->trans("Description")." (offered line)";
+			$line->qty = 1;
+			$line->subprice = 100;
+			$line->tva_tx = 19.6;
+			$line->localtax1_tx = 0;
+			$line->localtax2_tx = 0;
+			$line->remise_percent = 100;
+			$line->total_ht = 0;
+			$line->total_ttc = 0; // 90 * 1.196
+			$line->total_tva = 0;
+			$line->multicurrency_total_ht = 0;
+			$line->multicurrency_total_ttc = 0;
+			$line->multicurrency_total_tva = 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;
 			$xnbp++;
 		}
 	}
@@ -3984,27 +3984,27 @@ 
 	{
 		global $conf, $user;
 
-		$this->nb=array();
+		$this->nb = array();
 
 		$clause = "WHERE";
 
 		$sql = "SELECT count(f.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.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." f.entity = ".$conf->entity;
+		$sql .= " ".$clause." f.entity = ".$conf->entity;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["invoices"]=$obj->nb;
+				$this->nb["invoices"] = $obj->nb;
 			}
             $this->db->free($resql);
 			return 1;
@@ -4012,7 +4012,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -4037,19 +4037,19 @@ 
 	 *  @param  int			$hideref        Hide ref
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("bills");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'crabe';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->FACTURE_ADDON_PDF)) {
+			} elseif (!empty($conf->global->FACTURE_ADDON_PDF)) {
 				$modele = $conf->global->FACTURE_ADDON_PDF;
 			}
 		}
@@ -4066,8 +4066,8 @@ 
 	 */
 	function newCycle()
 	{
-		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture', 0).")";
+		$sql = 'SELECT max(situation_cycle_ref) FROM '.MAIN_DB_PREFIX.'facture as f';
+		$sql .= " WHERE f.entity in (".getEntity('facture', 0).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
@@ -4082,7 +4082,7 @@ 
 			return $ref;
 		} else {
 			$this->error = $this->db->lasterror();
-			dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+			dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -4106,10 +4106,10 @@ 
 	{
 		global $conf;
 
-		$sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'facture';
-		$sql .= ' where situation_cycle_ref = ' . $this->situation_cycle_ref;
-		$sql .= ' and situation_counter < ' . $this->situation_counter;
-		$sql .= ' AND entity = '. ($this->entity > 0 ? $this->entity : $conf->entity);
+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture';
+		$sql .= ' where situation_cycle_ref = '.$this->situation_cycle_ref;
+		$sql .= ' and situation_counter < '.$this->situation_counter;
+		$sql .= ' AND entity = '.($this->entity > 0 ? $this->entity : $conf->entity);
 		$resql = $this->db->query($sql);
 		$res = array();
 		if ($resql && $resql->num_rows > 0) {
@@ -4121,7 +4121,7 @@ 
 			}
 		} else {
 			$this->error = $this->db->error();
-			dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+			dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -4135,45 +4135,45 @@ 
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 				<0 if KO, >0 if OK
 	 */
-	function setFinal(User $user, $notrigger=0)
+	function setFinal(User $user, $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$this->situation_final = 1;
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture SET situation_final = ' . $this->situation_final . ' where rowid = ' . $this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET situation_final = '.$this->situation_final.' where rowid = '.$this->id;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if (!$resql)
 		{
-			$this->errors[]=$this->db->error();
+			$this->errors[] = $this->db->error();
 			$error++;
 		}
 
-		if (! $notrigger && empty($error))
+		if (!$notrigger && empty($error))
 		{
 			// Call trigger
-			$result=$this->call_trigger('BILL_MODIFY',$user);
+			$result = $this->call_trigger('BILL_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -4189,7 +4189,7 @@ 
 
 		if (!empty($this->situation_cycle_ref)) {
 			// No point in testing anything if we're not inside a cycle
-			$sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref . ' AND entity = ' . ($this->entity > 0 ? $this->entity : $conf->entity);
+			$sql = 'SELECT max(situation_counter) FROM '.MAIN_DB_PREFIX.'facture WHERE situation_cycle_ref = '.$this->situation_cycle_ref.' AND entity = '.($this->entity > 0 ? $this->entity : $conf->entity);
 			$resql = $this->db->query($sql);
 
 			if ($resql && $resql->num_rows > 0) {
@@ -4198,7 +4198,7 @@ 
 				return ($last == $this->situation_counter);
 			} else {
 				$this->error = $this->db->lasterror();
-				dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::select Error ".$this->error, LOG_ERR);
 				return false;
 			}
 		} else {
@@ -4247,8 +4247,8 @@ 
  */
 class FactureLigne extends CommonInvoiceLine
 {
-    public $element='facturedet';
-    public $table_element='facturedet';
+    public $element = 'facturedet';
+    public $table_element = 'facturedet';
 
 	var $oldline;
 
@@ -4264,9 +4264,9 @@ 
 	//! Description ligne
 	var $desc;
 
-	var $localtax1_type;	// Local tax 1 type
-	var $localtax2_type;	// Local tax 2 type
-	var $fk_remise_except;	// Link to line into llx_remise_except
+	var $localtax1_type; // Local tax 1 type
+	var $localtax2_type; // Local tax 2 type
+	var $fk_remise_except; // Link to line into llx_remise_except
 	var $rang = 0;
 
 	var $fk_fournprice;
@@ -4274,7 +4274,7 @@ 
 	var $marge_tx;
 	var $marque_tx;
 
-	var $special_code;	// Liste d'options non cumulabels:
+	var $special_code; // Liste d'options non cumulabels:
 	// 1: frais de port
 	// 2: ecotaxe
 	// 3: ??
@@ -4296,15 +4296,15 @@ 
 	 * @deprecated
 	 * @see product_ref
 	 */
-	var $ref;				// Product ref (deprecated)
-	var $product_ref;       // Product ref
+	var $ref; // Product ref (deprecated)
+	var $product_ref; // Product ref
 	/**
 	 * @deprecated
 	 * @see product_label
 	 */
-	var $libelle;      		// Product label (deprecated)
-	var $product_label;     // Product label
-	var $product_desc;  	// Description produit
+	var $libelle; // Product label (deprecated)
+	var $product_label; // Product label
+	var $product_desc; // Description produit
 
 	var $skip_update_total; // Skip update price total for special lines
 
@@ -4335,20 +4335,20 @@ 
 	function fetch($rowid)
 	{
 		$sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.vat_src_code, fd.tva_tx,';
-		$sql.= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,';
-		$sql.= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
-		$sql.= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
-		$sql.= ' fd.fk_code_ventilation,';
-		$sql.= ' fd.fk_unit, fd.fk_user_author, fd.fk_user_modif,';
-		$sql.= ' fd.situation_percent, fd.fk_prev_id,';
-		$sql.= ' fd.multicurrency_subprice,';
-		$sql.= ' fd.multicurrency_total_ht,';
-		$sql.= ' fd.multicurrency_total_tva,';
-		$sql.= ' fd.multicurrency_total_ttc,';
-		$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
-		$sql.= ' WHERE fd.rowid = '.$rowid;
+		$sql .= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,';
+		$sql .= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
+		$sql .= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
+		$sql .= ' fd.fk_code_ventilation,';
+		$sql .= ' fd.fk_unit, fd.fk_user_author, fd.fk_user_modif,';
+		$sql .= ' fd.situation_percent, fd.fk_prev_id,';
+		$sql .= ' fd.multicurrency_subprice,';
+		$sql .= ' fd.multicurrency_total_ht,';
+		$sql .= ' fd.multicurrency_total_tva,';
+		$sql .= ' fd.multicurrency_total_ttc,';
+		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
+		$sql .= ' WHERE fd.rowid = '.$rowid;
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -4356,53 +4356,53 @@ 
 			$objp = $this->db->fetch_object($result);
 
 			$this->rowid				= $objp->rowid;
-			$this->fk_facture			= $objp->fk_facture;
-			$this->fk_parent_line		= $objp->fk_parent_line;
+			$this->fk_facture = $objp->fk_facture;
+			$this->fk_parent_line = $objp->fk_parent_line;
 			$this->label				= $objp->custom_label;
 			$this->desc					= $objp->description;
-			$this->qty					= $objp->qty;
-			$this->subprice				= $objp->subprice;
-			$this->vat_src_code  		= $objp->vat_src_code;
-			$this->tva_tx				= $objp->tva_tx;
+			$this->qty = $objp->qty;
+			$this->subprice = $objp->subprice;
+			$this->vat_src_code = $objp->vat_src_code;
+			$this->tva_tx = $objp->tva_tx;
 			$this->localtax1_tx			= $objp->localtax1_tx;
 			$this->localtax2_tx			= $objp->localtax2_tx;
-			$this->remise_percent		= $objp->remise_percent;
-			$this->fk_remise_except		= $objp->fk_remise_except;
+			$this->remise_percent = $objp->remise_percent;
+			$this->fk_remise_except = $objp->fk_remise_except;
 			$this->fk_product			= $objp->fk_product;
-			$this->product_type			= $objp->product_type;
+			$this->product_type = $objp->product_type;
 			$this->date_start			= $this->db->jdate($objp->date_start);
 			$this->date_end				= $this->db->jdate($objp->date_end);
 			$this->info_bits			= $objp->info_bits;
-			$this->special_code			= $objp->special_code;
+			$this->special_code = $objp->special_code;
 			$this->total_ht				= $objp->total_ht;
 			$this->total_tva			= $objp->total_tva;
 			$this->total_localtax1		= $objp->total_localtax1;
 			$this->total_localtax2		= $objp->total_localtax2;
 			$this->total_ttc			= $objp->total_ttc;
-			$this->fk_code_ventilation	= $objp->fk_code_ventilation;
+			$this->fk_code_ventilation = $objp->fk_code_ventilation;
 			$this->rang					= $objp->rang;
-			$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];
 			$this->marge_tx				= $marginInfos[1];
 			$this->marque_tx			= $marginInfos[2];
 
-			$this->ref					= $objp->product_ref;      // deprecated
-			$this->product_ref			= $objp->product_ref;
-			$this->libelle				= $objp->product_libelle;  // deprecated
+			$this->ref = $objp->product_ref; // deprecated
+			$this->product_ref = $objp->product_ref;
+			$this->libelle				= $objp->product_libelle; // deprecated
 			$this->product_label		= $objp->product_libelle;
 			$this->product_desc			= $objp->product_desc;
 			$this->fk_unit				= $objp->fk_unit;
 			$this->fk_user_modif		= $objp->fk_user_modif;
-			$this->fk_user_author		= $objp->fk_user_author;
+			$this->fk_user_author = $objp->fk_user_author;
 
 			$this->situation_percent    = $objp->situation_percent;
 			$this->fk_prev_id           = $objp->fk_prev_id;
 
 			$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->multicurrency_total_tva = $objp->multicurrency_total_tva;
+			$this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
 
 			$this->db->free($result);
 
@@ -4422,39 +4422,39 @@ 
 	 *  @param      int     $noerrorifdiscountalreadylinked  1=Do not make error if lines is linked to a discount and discount already linked to another
 	 *	@return		int						                 <0 if KO, >0 if OK
 	 */
-	function insert($notrigger=0, $noerrorifdiscountalreadylinked=0)
+	function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
 	{
-		global $langs,$user,$conf;
+		global $langs, $user, $conf;
 
-		$error=0;
+		$error = 0;
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
 		// Clean parameters
-		$this->desc=trim($this->desc);
-		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_percent)) $this->remise_percent=0;
-		if (empty($this->info_bits)) $this->info_bits=0;
-		if (empty($this->subprice)) $this->subprice=0;
-		if (empty($this->special_code)) $this->special_code=0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+		$this->desc = trim($this->desc);
+		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_percent)) $this->remise_percent = 0;
+		if (empty($this->info_bits)) $this->info_bits = 0;
+		if (empty($this->subprice)) $this->subprice = 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_prev_id)) $this->fk_prev_id = 'null';
-		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
 
-		if (empty($this->pa_ht)) $this->pa_ht=0;
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
+		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
+		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4472,16 +4472,16 @@ 
 		// Check parameters
 		if ($this->product_type < 0)
 		{
-			$this->error='ErrorProductTypeMustBe0orMore';
+			$this->error = 'ErrorProductTypeMustBe0orMore';
 			return -1;
 		}
-		if (! empty($this->fk_product))
+		if (!empty($this->fk_product))
 		{
 			// Check product exists
-			$result=Product::isExistingObject('product', $this->fk_product);
+			$result = Product::isExistingObject('product', $this->fk_product);
 			if ($result <= 0)
 			{
-				$this->error='ErrorProductIdDoesNotExists';
+				$this->error = 'ErrorProductIdDoesNotExists';
 				return -1;
 			}
 		}
@@ -4490,68 +4490,68 @@ 
 
 		// Insertion dans base de la ligne
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet';
-		$sql.= ' (fk_facture, fk_parent_line, label, description, qty,';
-		$sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-		$sql.= ' fk_product, product_type, remise_percent, subprice, fk_remise_except,';
-		$sql.= ' date_start, date_end, fk_code_ventilation, ';
-		$sql.= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
-		$sql.= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
-		$sql.= ' situation_percent, fk_prev_id,';
-		$sql.= ' fk_unit, fk_user_author, fk_user_modif,';
-		$sql.= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ')';
-		$sql.= " VALUES (".$this->fk_facture.",";
-		$sql.= " ".($this->fk_parent_line>0 ? $this->fk_parent_line:"null").",";
-		$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " '".$this->db->escape($this->desc)."',";
-		$sql.= " ".price2num($this->qty).",";
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-		$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->fk_product)?$this->fk_product:"null").',';
-		$sql.= " ".$this->product_type.",";
-		$sql.= " ".price2num($this->remise_percent).",";
-		$sql.= " ".price2num($this->subprice).",";
-		$sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
-		$sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").",";
-		$sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").",";
-		$sql.= ' '.$this->fk_code_ventilation.',';
-		$sql.= ' '.$this->rang.',';
-		$sql.= ' '.$this->special_code.',';
-		$sql.= ' '.(! empty($this->fk_fournprice)?$this->fk_fournprice:"null").',';
-		$sql.= ' '.price2num($this->pa_ht).',';
-		$sql.= " '".$this->db->escape($this->info_bits)."',";
-		$sql.= " ".price2num($this->total_ht).",";
-		$sql.= " ".price2num($this->total_tva).",";
-		$sql.= " ".price2num($this->total_ttc).",";
-		$sql.= " ".price2num($this->total_localtax1).",";
-		$sql.= " ".price2num($this->total_localtax2);
-		$sql.= ", " . $this->situation_percent;
-		$sql.= ", " . $this->fk_prev_id;
-		$sql.= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= ", ".$user->id;
-		$sql.= ", ".$user->id;
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".price2num($this->multicurrency_subprice);
-		$sql.= ", ".price2num($this->multicurrency_total_ht);
-		$sql.= ", ".price2num($this->multicurrency_total_tva);
-		$sql.= ", ".price2num($this->multicurrency_total_ttc);
-		$sql.= ')';
+		$sql .= ' (fk_facture, fk_parent_line, label, description, qty,';
+		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+		$sql .= ' fk_product, product_type, remise_percent, subprice, fk_remise_except,';
+		$sql .= ' date_start, date_end, fk_code_ventilation, ';
+		$sql .= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
+		$sql .= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
+		$sql .= ' situation_percent, fk_prev_id,';
+		$sql .= ' fk_unit, fk_user_author, fk_user_modif,';
+		$sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ')';
+		$sql .= " VALUES (".$this->fk_facture.",";
+		$sql .= " ".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null").",";
+		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " '".$this->db->escape($this->desc)."',";
+		$sql .= " ".price2num($this->qty).",";
+        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+		$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->fk_product) ? $this->fk_product : "null").',';
+		$sql .= " ".$this->product_type.",";
+		$sql .= " ".price2num($this->remise_percent).",";
+		$sql .= " ".price2num($this->subprice).",";
+		$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
+		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+		$sql .= ' '.$this->fk_code_ventilation.',';
+		$sql .= ' '.$this->rang.',';
+		$sql .= ' '.$this->special_code.',';
+		$sql .= ' '.(!empty($this->fk_fournprice) ? $this->fk_fournprice : "null").',';
+		$sql .= ' '.price2num($this->pa_ht).',';
+		$sql .= " '".$this->db->escape($this->info_bits)."',";
+		$sql .= " ".price2num($this->total_ht).",";
+		$sql .= " ".price2num($this->total_tva).",";
+		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= " ".price2num($this->total_localtax1).",";
+		$sql .= " ".price2num($this->total_localtax2);
+		$sql .= ", ".$this->situation_percent;
+		$sql .= ", ".$this->fk_prev_id;
+		$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= ", ".$user->id;
+		$sql .= ", ".$user->id;
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".price2num($this->multicurrency_subprice);
+		$sql .= ", ".price2num($this->multicurrency_total_ht);
+		$sql .= ", ".price2num($this->multicurrency_total_tva);
+		$sql .= ", ".price2num($this->multicurrency_total_ttc);
+		$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.'facturedet');
+			$this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
 
             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++;
@@ -4562,8 +4562,8 @@ 
 			// ce qui la flague comme "consommee".
 			if ($this->fk_remise_except)
 			{
-				$discount=new DiscountAbsolute($this->db);
-				$result=$discount->fetch($this->fk_remise_except);
+				$discount = new DiscountAbsolute($this->db);
+				$result = $discount->fetch($this->fk_remise_except);
 				if ($result >= 0)
 				{
 					// Check if discount was found
@@ -4574,7 +4574,7 @@ 
 						{
 						    if (empty($noerrorifdiscountalreadylinked))
 						    {
-    							$this->error=$langs->trans("ErrorDiscountAlreadyUsed",$discount->id);
+    							$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
     							dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
     							$this->db->rollback();
     							return -3;
@@ -4582,10 +4582,10 @@ 
 						}
 						else
 						{
-							$result=$discount->link_to_invoice($this->rowid,0);
+							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0)
 							{
-								$this->error=$discount->error;
+								$this->error = $discount->error;
 								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 								$this->db->rollback();
 								return -3;
@@ -4594,7 +4594,7 @@ 
 					}
 					else
 					{
-						$this->error=$langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
+						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
 						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
@@ -4602,17 +4602,17 @@ 
 				}
 				else
 				{
-					$this->error=$discount->error;
+					$this->error = $discount->error;
 					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
 			}
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('LINEBILL_INSERT',$user);
+                $result = $this->call_trigger('LINEBILL_INSERT', $user);
                 if ($result < 0)
                 {
 					$this->db->rollback();
@@ -4627,7 +4627,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4640,35 +4640,35 @@ 
 	 *	@param		int		$notrigger	Disable triggers
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-	function update($user='',$notrigger=0)
+	function update($user = '', $notrigger = 0)
 	{
-		global $user,$conf;
+		global $user, $conf;
 
-		$error=0;
+		$error = 0;
 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
 		// Clean parameters
-		$this->desc=trim($this->desc);
-		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->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->product_type)) $this->product_type=0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-		if (empty($this->pa_ht)) $this->pa_ht=0;
-
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+		$this->desc = trim($this->desc);
+		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->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->product_type)) $this->product_type = 0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+		if (empty($this->pa_ht)) $this->pa_ht = 0;
+
+		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
+		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
+		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
 		// Check parameters
 		if ($this->product_type < 0) return -1;
@@ -4690,66 +4690,66 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
-        $sql.= " description='".$this->db->escape($this->desc)."'";
-        $sql.= ", label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-        $sql.= ", subprice=".price2num($this->subprice)."";
-        $sql.= ", remise_percent=".price2num($this->remise_percent)."";
-        if ($this->fk_remise_except) $sql.= ", fk_remise_except=".$this->fk_remise_except;
-        else $sql.= ", fk_remise_except=null";
-		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->db->escape($this->vat_src_code))."'";
-        $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.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-        $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-        $sql.= ", product_type=".$this->product_type;
-        $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $sql.= ", special_code='".$this->db->escape($this->special_code)."'";
+        $sql .= " description='".$this->db->escape($this->desc)."'";
+        $sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+        $sql .= ", subprice=".price2num($this->subprice)."";
+        $sql .= ", remise_percent=".price2num($this->remise_percent)."";
+        if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
+        else $sql .= ", fk_remise_except=null";
+		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
+        $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 .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= ", product_type=".$this->product_type;
+        $sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
+        $sql .= ", special_code='".$this->db->escape($this->special_code)."'";
         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)."'";
-		$sql.= ", fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
-		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
-		$sql.= ", situation_percent=" . $this->situation_percent;
-		$sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= ", fk_user_modif =".$user->id;
+		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
+		$sql .= ", buy_price_ht='".price2num($this->pa_ht)."'";
+		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
+		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		$sql .= ", situation_percent=".$this->situation_percent;
+		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= ", fk_user_modif =".$user->id;
 
 		// 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('LINEBILL_UPDATE',$user);
+                $result = $this->call_trigger('LINEBILL_UPDATE', $user);
                 if ($result < 0)
  				{
 					$this->db->rollback();
@@ -4762,7 +4762,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4781,7 +4781,7 @@ 
 		$this->db->begin();
 
 		// Call trigger
-		$result=$this->call_trigger('LINEBILL_DELETE',$user);
+		$result = $this->call_trigger('LINEBILL_DELETE', $user);
 		if ($result < 0)
 		{
 			$this->db->rollback();
@@ -4792,14 +4792,14 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		if ($this->db->query($sql) )
+		if ($this->db->query($sql))
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error()." sql=".$sql;
+			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
 		}
@@ -4816,21 +4816,21 @@ 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		// Clean parameters
-		if (empty($this->total_localtax1)) $this->total_localtax1=0;
-		if (empty($this->total_localtax2)) $this->total_localtax2=0;
+		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
-		$sql.= " total_ht=".price2num($this->total_ht)."";
-		$sql.= ",total_tva=".price2num($this->total_tva)."";
-		$sql.= ",total_localtax1=".price2num($this->total_localtax1)."";
-		$sql.= ",total_localtax2=".price2num($this->total_localtax2)."";
-		$sql.= ",total_ttc=".price2num($this->total_ttc)."";
-		$sql.= " WHERE rowid = ".$this->rowid;
+		$sql .= " total_ht=".price2num($this->total_ht)."";
+		$sql .= ",total_tva=".price2num($this->total_tva)."";
+		$sql .= ",total_localtax1=".price2num($this->total_localtax1)."";
+		$sql .= ",total_localtax2=".price2num($this->total_localtax2)."";
+		$sql .= ",total_ttc=".price2num($this->total_ttc)."";
+		$sql .= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
@@ -4838,7 +4838,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4857,18 +4857,18 @@ 
 			return 0;
 		} else {
 		    // If invoice is a not a situation invoice, this->fk_prev_id is used for something else
-            $tmpinvoice=new Facture($this->db);
+            $tmpinvoice = new Facture($this->db);
             $tmpinvoice->fetch($invoiceid);
             if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0;
 
-			$sql = 'SELECT situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet WHERE rowid=' . $this->fk_prev_id;
+			$sql = 'SELECT situation_percent FROM '.MAIN_DB_PREFIX.'facturedet WHERE rowid='.$this->fk_prev_id;
 			$resql = $this->db->query($sql);
 			if ($resql && $resql->num_rows > 0) {
 				$res = $this->db->fetch_array($resql);
 				return $res['situation_percent'];
 			} else {
 				$this->error = $this->db->error();
-				dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::select Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}

Braces +685 added lines, -361 removed lines

@@ -234,19 +234,30 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
 		$this->ref_client=trim($this->ref_client);
 		$this->note=(isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
 		$this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note_private));
 		$this->note_public=trim($this->note_public);
-		if (! $this->cond_reglement_id) $this->cond_reglement_id = 0;
-		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
+		if (! $this->cond_reglement_id) {
+			$this->cond_reglement_id = 0;
+		}
+		if (! $this->mode_reglement_id) {
+			$this->mode_reglement_id = 0;
+		}
 		$this->brouillon = 1;
-        if (empty($this->entity)) $this->entity = $conf->entity;
+        if (empty($this->entity)) {
+        	$this->entity = $conf->entity;
+        }
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -311,7 +322,9 @@ 
 			$this->location_incoterms= $_facrec->location_incoterms;
 
 			// Clean parameters
-			if (! $this->type) $this->type = self::TYPE_STANDARD;
+			if (! $this->type) {
+				$this->type = self::TYPE_STANDARD;
+			}
 			$this->ref_client=trim($this->ref_client);
 			$this->note_public=trim($this->note_public);
 			$this->note_private=trim($this->note_private);
@@ -320,7 +333,9 @@ 
 		    $this->array_options=$_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
-			if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
+			if (! $this->mode_reglement_id) {
+				$this->mode_reglement_id = 0;
+			}
 			$this->brouillon = 1;
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
@@ -331,7 +346,9 @@ 
 			if ($_facrec->frequency > 0)
 			{
 			    dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
-			    if (empty($_facrec->date_when)) $_facrec->date_when = $now;
+			    if (empty($_facrec->date_when)) {
+			    	$_facrec->date_when = $now;
+			    }
                 $next_date = $_facrec->getNextDate();   // Calculate next date
                 $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
                 //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
@@ -342,8 +359,14 @@ 
 			$outputlangs = $langs;
 			$newlang='';
 
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) $newlang=$this->thirdparty->default_lang;  // for proposal, order, invoice, ...
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang=$this->default_lang;                  // for thirdparty
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) {
+				$newlang=$this->thirdparty->default_lang;
+			}
+			// for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) {
+				$newlang=$this->default_lang;
+			}
+			// for thirdparty
 			if (! empty($newlang))
 			{
 			    $outputlangs = new Translate("",$conf);
@@ -449,26 +472,29 @@ 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 			$resql=$this->db->query($sql);
-			if (! $resql) $error++;
+			if (! $resql) {
+				$error++;
+			}
 
 			// Add object linked
 			if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
 			{
 				foreach($this->linked_objects as $origin => $tmp_origin_id)
 				{
-				    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+				    if (is_array($tmp_origin_id)) {
+				    	// New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
 				    {
 				        foreach($tmp_origin_id as $origin_id)
 				        {
 				            $ret = $this->add_object_linked($origin, $origin_id);
+				    }
 				            if (! $ret)
 				            {
 				                dol_print_error($this->db);
 				                $error++;
 				            }
 				        }
-				    }
-				    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    } else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -481,13 +507,17 @@ 
 				}
 			}
 
-			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id)) {
+				// Get contact from origin object
 			{
 				$originforcontact = $this->origin;
+			}
 				$originidforcontact = $this->origin_id;
-				if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+				if ($originforcontact == 'shipping') {
+					// shipment and order share the same contacts. If creating from shipment we take data of order
 				{
 				    require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+				}
 				    $exp = new Expedition($this->db);
 				    $exp->fetch($this->origin_id);
 				    $exp->fetchObjectLinked();
@@ -496,8 +526,11 @@ 
 				        foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
 				        {
 				            $originforcontact = 'commande';
-				            if (is_object($value)) $originidforcontact = $value->id;
-				            else $originidforcontact = $value;
+				            if (is_object($value)) {
+				            	$originidforcontact = $value->id;
+				            } else {
+				            	$originidforcontact = $value;
+				            }
 				            break; // We take first one
 				        }
 				    }
@@ -514,16 +547,19 @@ 
 				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
 				    }
+				} else {
+					dol_print_error($resqlcontact);
 				}
-				else dol_print_error($resqlcontact);
 			}
 
 			/*
 			 *  Insert lines of invoices into database
 			 */
-			if (count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
+			if (count($this->lines) && is_object($this->lines[0])) {
+				// If this->lines is array of InvoiceLines (preferred mode)
 			{
 				$fk_parent_line = 0;
+			}
 
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
 				foreach ($this->lines as $i => $val)
@@ -557,8 +593,7 @@ 
 						break;
 					}
 				}
-			}
-			else	// If this->lines is an array of invoice line arrays
+			} else	// If this->lines is an array of invoice line arrays
 			{
 				$fk_parent_line = 0;
 
@@ -570,7 +605,9 @@ 
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+                	if (! is_object($line)) {
+                		$line = (object) $line;
+                	}
 
 				    if ($result >= 0)
 					{
@@ -639,7 +676,9 @@ 
 					}
 					$tva_tx = get_default_tva($mysoc,$soc,$prod->id);
 					$tva_npr = get_default_npr($mysoc,$soc,$prod->id);
-					if (empty($tva_tx)) $tva_npr=0;
+					if (empty($tva_tx)) {
+						$tva_npr=0;
+					}
 					$localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
 					$localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
 
@@ -698,7 +737,9 @@ 
 					if (! $error)
 					{
 					    $result=$this->insertExtraFields();
-					    if ($result < 0) $error++;
+					    if ($result < 0) {
+					    	$error++;
+					    }
 					}
 						/*}
 					}
@@ -706,35 +747,33 @@ 
 
                     // Call trigger
                     $result=$this->call_trigger('BILL_CREATE',$user);
-                    if ($result < 0) $error++;
+                    if ($result < 0) {
+                    	$error++;
+                    }
                     // End call triggers
 
 					if (! $error)
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
+					} else
 					{
 						$this->db->rollback();
 						return -4;
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -812,8 +851,7 @@ 
 		{
 			$this->error=$facture->error;
 			$this->errors=$facture->errors;
-		}
-		elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
+		} elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$this->fetchObjectLinked('', '', $object->id, 'facture');
 
@@ -849,8 +887,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;
@@ -892,26 +931,31 @@ 
 		// Loop on each line of new invoice
 		foreach($this->lines as $i => $line)
 		{
-			if (($this->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+			if (($this->lines[$i]->info_bits & 0x02) == 0x02) {
+				// We do not clone line of discounts
 			{
 				unset($this->lines[$i]);
+			}
 				unset($this->products[$i]);	// Tant que products encore utilise
 			}
 		}
 
 		// Create clone
 		$result=$this->create($user);
-		if ($result < 0) $error++;
-		else {
+		if ($result < 0) {
+			$error++;
+		} else {
 			// copy internal contacts
-			if ($this->copy_linked_contact($objFrom, 'internal') < 0)
-				$error++;
+			if ($this->copy_linked_contact($objFrom, 'internal') < 0) {
+							$error++;
+			}
 
 			// copy external contacts if same company
 			elseif ($objFrom->socid == $this->socid)
 			{
-				if ($this->copy_linked_contact($objFrom, 'external') < 0)
-					$error++;
+				if ($this->copy_linked_contact($objFrom, 'external') < 0) {
+									$error++;
+				}
 			}
 		}
 
@@ -923,12 +967,16 @@ 
 				$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
             $result=$this->call_trigger('BILL_CLONE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
 		}
 
@@ -939,8 +987,7 @@ 
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -996,8 +1043,9 @@ 
 
             // get extrafields from original line
 			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
-			foreach($object->lines[$i]->array_options as $options_key => $value)
-				$line->array_options[$options_key] = $value;
+			foreach($object->lines[$i]->array_options as $options_key => $value) {
+							$line->array_options[$options_key] = $value;
+			}
 
 			$this->lines[$i] = $line;
 		}
@@ -1020,8 +1068,9 @@ 
 
         // get extrafields from original line
 		$object->fetch_optionals($object->id);
-		foreach($object->array_options as $options_key => $value)
-			$this->array_options[$options_key] = $value;
+		foreach($object->array_options as $options_key => $value) {
+					$this->array_options[$options_key] = $value;
+		}
 
 		// Possibility to add external linked objects with hooks
 		$this->linked_objects[$this->origin] = $this->origin_id;
@@ -1040,15 +1089,19 @@ 
 			$parameters=array('objFrom'=>$object);
 			$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++;
+			}
 
 			if (! $error)
 			{
 				return 1;
+			} else {
+				return -1;
 			}
-			else return -1;
+		} else {
+			return -1;
 		}
-		else return -1;
 	}
 
 	/**
@@ -1092,46 +1145,82 @@ 
 	{
 		global $langs, $conf, $user, $form;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (! empty($conf->dol_no_mouse_hover)) {
+        	$notooltip=1;
+        }
+        // Force disable tooltips
 
 		$result='';
 
-		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
-		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
+		if ($option == 'withdraw') {
+			$url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
+		}
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		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';
+			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';
+			}
 		}
 
 		$picto='bill';
-		if ($this->type == self::TYPE_REPLACEMENT) $picto.='r';	// Replacement invoice
-		if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a';	// Credit note
-		if ($this->type == self::TYPE_DEPOSIT) $picto.='d';	// Deposit invoice
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			$picto.='r';
+		}
+		// Replacement invoice
+		if ($this->type == self::TYPE_CREDIT_NOTE) {
+			$picto.='a';
+		}
+		// Credit note
+		if ($this->type == self::TYPE_DEPOSIT) {
+			$picto.='d';
+		}
+		// Deposit invoice
         $label='';
 
         if ($user->rights->facture->lire) {
             $label = '<u>' . $langs->trans("ShowInvoice") . '</u>';
-            if (! empty($this->ref))
-                $label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
-            if (! empty($this->ref_client))
-                $label .= '<br><b>' . $langs->trans('RefCustomer') . ':</b> ' . $this->ref_client;
-            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 ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-    		if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-    		if ($this->type == self::TYPE_DEPOSIT) $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-    		if ($this->type == self::TYPE_SITUATION) $label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
-    		if ($moretitle) $label.=' - '.$moretitle;
+            if (! empty($this->ref)) {
+                            $label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
+            }
+            if (! empty($this->ref_client)) {
+                            $label .= '<br><b>' . $langs->trans('RefCustomer') . ':</b> ' . $this->ref_client;
+            }
+            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 ($this->type == self::TYPE_REPLACEMENT) {
+    			$label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+    		}
+    		if ($this->type == self::TYPE_CREDIT_NOTE) {
+    			$label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+    		}
+    		if ($this->type == self::TYPE_DEPOSIT) {
+    			$label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+    		}
+    		if ($this->type == self::TYPE_SITUATION) {
+    			$label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
+    		}
+    		if ($moretitle) {
+    			$label.=' - '.$moretitle;
+    		}
         }
 
 		$linkclose='';
@@ -1150,9 +1239,15 @@ 
         $linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        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 != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
+        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 != 2) {
+			$result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
+		}
 
 		if ($addlinktonotes)
 		{
@@ -1185,7 +1280,9 @@ 
 	{
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int)) {
+			return -1;
+		}
 
 		$sql = 'SELECT f.rowid,f.facnumber,f.ref_client,f.ref_ext,f.ref_int,f.type,f.fk_soc,f.amount';
 		$sql.= ', f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc, f.revenuestamp';
@@ -1210,10 +1307,18 @@ 
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 		$sql.= ' WHERE f.entity = '.$conf->entity;
-		if ($rowid)   $sql.= " AND f.rowid=".$rowid;
-		if ($ref)     $sql.= " AND f.facnumber='".$this->db->escape($ref)."'";
-		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
-		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
+		if ($rowid) {
+			$sql.= " AND f.rowid=".$rowid;
+		}
+		if ($ref) {
+			$sql.= " AND f.facnumber='".$this->db->escape($ref)."'";
+		}
+		if ($ref_ext) {
+			$sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
+		}
+		if ($ref_int) {
+			$sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1287,7 +1392,9 @@ 
 					$this->fetchPreviousNextSituationInvoice();
 				}
 
-				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve all extrafield for invoice
 				// fetch optionals attributes and labels
@@ -1309,15 +1416,13 @@ 
 					return -3;
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error='Bill with id '.$rowid.' or ref '.$ref.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -1421,8 +1526,7 @@ 
 			}
 			$this->db->free($result);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -3;
@@ -1452,8 +1556,11 @@ 
 				$invoice = new Facture($this->db);
 				if ($invoice->fetch($objp->rowid) > 0)
 				{
-					if ($objp->situation_counter < $this->situation_counter) $this->tab_previous_situation_invoice[] = $invoice;
-					else $this->tab_next_situation_invoice[] = $invoice;
+					if ($objp->situation_counter < $this->situation_counter) {
+						$this->tab_previous_situation_invoice[] = $invoice;
+					} else {
+						$this->tab_next_situation_invoice[] = $invoice;
+					}
 				}
 			}
 		}
@@ -1472,17 +1579,40 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type= self::TYPE_STANDARD;
-		if (isset($this->facnumber)) $this->facnumber=trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client=trim($this->ref_client);
-		if (isset($this->increment)) $this->increment=trim($this->increment);
-		if (isset($this->close_code)) $this->close_code=trim($this->close_code);
-		if (isset($this->close_note)) $this->close_note=trim($this->close_note);
-		if (isset($this->note) || isset($this->note_private)) $this->note=(isset($this->note) ? trim($this->note) : trim($this->note_private));		// deprecated
-		if (isset($this->note) || isset($this->note_private)) $this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (empty($this->type)) {
+			$this->type= self::TYPE_STANDARD;
+		}
+		if (isset($this->facnumber)) {
+			$this->facnumber=trim($this->ref);
+		}
+		if (isset($this->ref_client)) {
+			$this->ref_client=trim($this->ref_client);
+		}
+		if (isset($this->increment)) {
+			$this->increment=trim($this->increment);
+		}
+		if (isset($this->close_code)) {
+			$this->close_code=trim($this->close_code);
+		}
+		if (isset($this->close_note)) {
+			$this->close_note=trim($this->close_note);
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note=(isset($this->note) ? trim($this->note) : trim($this->note_private));
+		}
+		// deprecated
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		}
+		if (isset($this->note_public)) {
+			$this->note_public=trim($this->note_public);
+		}
+		if (isset($this->modelpdf)) {
+			$this->modelpdf=trim($this->modelpdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key=trim($this->import_key);
+		}
 		if (empty($this->situation_cycle_ref)) {
 			$this->situation_cycle_ref = 'null';
 		}
@@ -1553,7 +1683,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('BILL_MODIFY',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 		}
@@ -1568,8 +1700,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -1597,9 +1728,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;
 			}
@@ -1655,22 +1788,19 @@ 
 
 					$this->db->commit();
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$facligne->error;
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$facligne->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -3;
@@ -1693,10 +1823,11 @@ 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-		if (empty($ref_client))
-			$sql .= ' SET ref_client = NULL';
-		else
-			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		if (empty($ref_client)) {
+					$sql .= ' SET ref_client = NULL';
+		} else {
+					$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
@@ -1716,7 +1847,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('BILL_MODIFY',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -1727,8 +1860,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -1760,7 +1892,9 @@ 
 		// Test to avoid invoice deletion (allowed if draft)
 		$test = $this->is_erasable();
 
-		if ($test <= 0) return $test;
+		if ($test <= 0) {
+			return $test;
+		}
 
 		$error=0;
 
@@ -1770,7 +1904,9 @@ 
 		{
             // Call trigger
             $result=$this->call_trigger('BILL_DELETE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
 		}
 
@@ -1788,7 +1924,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (! $error)
@@ -1837,8 +1975,12 @@ 
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr",$this->ref));
-						else $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr",$this->ref));	// we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) {
+							$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr",$this->ref));
+						} else {
+							$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr",$this->ref));
+						}
+						// we use 0 for price, to not change the weighted average value
 					}
 				}
 			}
@@ -1864,22 +2006,28 @@ 
 					{
 						$dir = $conf->facture->dir_output . "/" . $ref;
 						$file = $conf->facture->dir_output . "/" . $ref . "/" . $ref . ".pdf";
-						if (file_exists($file))	// We must delete all files before deleting directory
+						if (file_exists($file)) {
+							// We must delete all files before deleting directory
 						{
 							$ret=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=$langs->trans("ErrorCanNotDeleteFile",$file);
+							}
 								$this->db->rollback();
 								return 0;
 							}
 						}
 						if (file_exists($dir))
 						{
-							if (! dol_delete_dir_recursive($dir)) // For remove dir and meta
+							if (! dol_delete_dir_recursive($dir)) {
+								// For remove dir and meta
 							{
 								$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+							}
 								$this->db->rollback();
 								return 0;
 							}
@@ -1888,22 +2036,19 @@ 
 
 					$this->db->commit();
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror()." sql=".$sql;
 					$this->db->rollback();
 					return -6;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror()." sql=".$sql;
 				$this->db->rollback();
 				return -4;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -2;
@@ -1930,9 +2075,15 @@ 
 			dol_syslog(get_class($this)."::set_paid rowid=".$this->id, LOG_DEBUG);
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 			$sql.= ' fk_statut='.self::STATUS_CLOSED;
-			if (! $close_code) $sql.= ', paye=1';
-			if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'";
-			if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
+			if (! $close_code) {
+				$sql.= ', paye=1';
+			}
+			if ($close_code) {
+				$sql.= ", close_code='".$this->db->escape($close_code)."'";
+			}
+			if ($close_note) {
+				$sql.= ", close_note='".$this->db->escape($close_note)."'";
+			}
 			$sql.= ' WHERE rowid = '.$this->id;
 
 			dol_syslog(get_class($this)."::set_paid", LOG_DEBUG);
@@ -1941,10 +2092,11 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('BILL_PAYED',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->lasterror();
@@ -1954,14 +2106,12 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -1992,10 +2142,11 @@ 
 		{
             // Call trigger
             $result=$this->call_trigger('BILL_UNPAYED',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
-		}
-		else
+		} else
 		{
 			$error++;
 			$this->error=$this->db->error();
@@ -2006,8 +2157,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2034,8 +2184,12 @@ 
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 		$sql.= ' fk_statut='.self::STATUS_ABANDONED;
-		if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'";
-		if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
+		if ($close_code) {
+			$sql.= ", close_code='".$this->db->escape($close_code)."'";
+		}
+		if ($close_note) {
+			$sql.= ", close_note='".$this->db->escape($close_note)."'";
+		}
 		$sql.= ' WHERE rowid = '.$this->id;
 
 		$resql = $this->db->query($sql);
@@ -2061,15 +2215,13 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." sql=".$sql;
 			$this->db->rollback();
@@ -2124,12 +2276,14 @@ 
 		$this->db->begin();
 
 		// Check parameters
-		if ($this->type == self::TYPE_REPLACEMENT)		// si facture de remplacement
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			// si facture de remplacement
 		{
 			// Controle que facture source connue
 			if ($this->fk_facture_source <= 0)
 			{
 				$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("InvoiceReplacement"));
+		}
 				$this->db->rollback();
 				return -10;
 			}
@@ -2168,17 +2322,17 @@ 
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		} else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+			// empty should not happened, but when it occurs, the test save life
 		{
 			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
 				$this->date=dol_now();
+		}
 				$this->date_lim_reglement=$this->calculate_date_lim_reglement();
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else
+		} else
 		{
 			$num = $this->ref;
 		}
@@ -2191,9 +2345,11 @@ 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql.= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
+			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {
+				// If option enabled, we force invoice date
 			{
 				$sql.= ", datef='".$this->db->idate($this->date)."'";
+			}
 				$sql.= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
 			}
 			$sql.= ' WHERE rowid = '.$this->id;
@@ -2232,8 +2388,11 @@ 
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
 							// We decrease stock for product
-							if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr",$num));
-							else $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
+							if ($this->type == self::TYPE_CREDIT_NOTE) {
+								$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr",$num));
+							} else {
+								$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
+							}
 							if ($result < 0) {
 								$error++;
 							}
@@ -2247,7 +2406,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('BILL_VALIDATE',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 
@@ -2317,8 +2478,7 @@ 
     				}
                 }
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 		}
@@ -2327,8 +2487,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2417,8 +2576,12 @@ 
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
-						else $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));	// we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) {
+							$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
+						} else {
+							$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
+						}
+						// we use 0 for price, to not change the weighted average value
 					}
 				}
 			}
@@ -2446,14 +2609,12 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -2513,17 +2674,39 @@ 
 		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($ventil)) $ventil=0;
-		if (empty($txtva)) $txtva=0;
-		if (empty($txlocaltax1)) $txlocaltax1=0;
-		if (empty($txlocaltax2)) $txlocaltax2=0;
-		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-		if (empty($fk_prev_id)) $fk_prev_id = 'null';
-		if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+		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($ventil)) {
+			$ventil=0;
+		}
+		if (empty($txtva)) {
+			$txtva=0;
+		}
+		if (empty($txlocaltax1)) {
+			$txlocaltax1=0;
+		}
+		if (empty($txlocaltax2)) {
+			$txlocaltax2=0;
+		}
+		if (empty($fk_parent_line) || $fk_parent_line < 0) {
+			$fk_parent_line=0;
+		}
+		if (empty($fk_prev_id)) {
+			$fk_prev_id = 'null';
+		}
+		if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+			$situation_percent = 100;
+		}
 
 		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
@@ -2547,14 +2730,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 (! empty($this->brouillon))
 		{
@@ -2666,7 +2850,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 facture meme
 				$result=$this->update_price(1,'auto',0,$mysoc);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
@@ -2674,15 +2860,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();
@@ -2740,7 +2924,9 @@ 
 			{
 				if (!$this->checkProgressLine($rowid, $situation_percent))
 				{
-					if (!$this->error) $this->error=$langs->trans('invoiceLineProgressError');
+					if (!$this->error) {
+						$this->error=$langs->trans('invoiceLineProgressError');
+					}
 					return -3;
 				}
 			}
@@ -2748,10 +2934,18 @@ 
 			$this->db->begin();
 
 			// Clean parameters
-			if (empty($qty)) $qty=0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-			if (empty($special_code) || $special_code == 3) $special_code=0;
-			if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+			if (empty($qty)) {
+				$qty=0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line=0;
+			}
+			if (empty($special_code) || $special_code == 3) {
+				$special_code=0;
+			}
+			if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+				$situation_percent = 100;
+			}
 
 			$remise_percent	= price2num($remise_percent);
 			$qty			= price2num($qty);
@@ -2762,7 +2956,9 @@ 
 			$txlocaltax2	= price2num($txlocaltax2);
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			// Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
@@ -2882,21 +3078,21 @@ 
 			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 info denormalisees au niveau facture
 				$this->update_price(1);
 				$this->db->commit();
 				return $result;
-			}
-			else
+			} else
 			{
 			    $this->error=$this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error="Invoice statut makes operation forbidden";
 			return -2;
@@ -2926,8 +3122,11 @@ 
 
 		$obj = $this->db->fetch_object($result);
 
-		if ($obj === null) return true;
-		else return $situation_percent < $obj->situation_percent;
+		if ($obj === null) {
+			return true;
+		} else {
+			return $situation_percent < $obj->situation_percent;
+		}
 	}
 
 	/**
@@ -2944,7 +3143,9 @@ 
 		include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php');
 
 		// Cap percentages to 100
-		if ($percent > 100) $percent = 100;
+		if ($percent > 100) {
+			$percent = 100;
+		}
 		$line->situation_percent = $percent;
 		$tabprice = calcul_price_total($line->qty, $line->subprice, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 0, 'HT', 0, $line->product_type, $mysoc, '', $percent);
 		$line->total_ht = $tabprice[0];
@@ -2997,7 +3198,9 @@ 
 
 		// For triggers
 		$result = $line->fetch($rowid);
-		if (! ($result > 0)) dol_print_error($db, $line->error, $line->errors);
+		if (! ($result > 0)) {
+			dol_print_error($db, $line->error, $line->errors);
+		}
 
 		if ($line->delete($user) > 0)
 		{
@@ -3007,15 +3210,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->lasterror();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$line->error;
@@ -3034,7 +3235,9 @@ 
 	function set_remise($user, $remise, $notrigger=0)
 	{
 		// Clean parameters
-		if (empty($remise)) $remise=0;
+		if (empty($remise)) {
+			$remise=0;
+		}
 
 		if ($user->rights->facture->creer)
 		{
@@ -3061,7 +3264,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('BILL_MODIFY',$user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3072,8 +3277,7 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				foreach($this->errors as $errmsg)
 				{
@@ -3097,7 +3301,9 @@ 
 	 */
 	function set_remise_absolue($user, $remise, $notrigger=0)
 	{
-		if (empty($remise)) $remise=0;
+		if (empty($remise)) {
+			$remise=0;
+		}
 
 		if ($user->rights->facture->creer)
 		{
@@ -3131,7 +3337,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('BILL_MODIFY',$user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3139,8 +3347,7 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				foreach($this->errors as $errmsg)
 				{
@@ -3182,7 +3389,9 @@ 
 		$sql.= ' AND pf.'.$field2.' = p.rowid';
 		$sql.= ' AND p.fk_paiement = t.id';
 		$sql.= ' AND t.entity IN (' . getEntity('c_paiement').')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
+		if ($filtertype) {
+			$sql.=" AND t.code='PRE'";
+		}
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -3198,8 +3407,7 @@ 
 			}
 			$this->db->free($resql);
 			return $retarray;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_print_error($this->db);
@@ -3222,9 +3430,13 @@ 
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON='mod_facture_terre';
-		else if ($conf->global->FACTURE_ADDON=='terre') $conf->global->FACTURE_ADDON='mod_facture_terre';
-		else if ($conf->global->FACTURE_ADDON=='mercure') $conf->global->FACTURE_ADDON='mod_facture_mercure';
+		if (empty($conf->global->FACTURE_ADDON)) {
+			$conf->global->FACTURE_ADDON='mod_facture_terre';
+		} else if ($conf->global->FACTURE_ADDON=='terre') {
+			$conf->global->FACTURE_ADDON='mod_facture_terre';
+		} else if ($conf->global->FACTURE_ADDON=='mercure') {
+			$conf->global->FACTURE_ADDON='mod_facture_mercure';
+		}
 
 		if (! empty($conf->global->FACTURE_ADDON))
 		{
@@ -3288,8 +3500,7 @@ 
 			}
 
 			return $numref;
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
@@ -3334,8 +3545,7 @@ 
 				$this->date_validation   = $this->db->jdate($obj->datev);	// Should be in log table
 			}
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -3362,8 +3572,7 @@ 
 		if ($ventilExportCompta <> 0)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -3386,13 +3595,19 @@ 
 		// we check if invoice is a temporary number (PROVxxxx)
 		$tmppart = substr($this->ref, 1, 4);
 
-		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
+		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') {
+			// If draft invoice and ref not yet defined
 		{
 			return 1;
 		}
+		}
 
-		if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 2;
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED))  return 0;
+		if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {
+			return 2;
+		}
+		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) {
+			return 0;
+		}
 
 		// TODO Test if there is at least one payment. If yes, refuse to delete.
 		// ...
@@ -3401,15 +3616,21 @@ 
 		if ($tmppart !== 'PROV')
 		{
 			// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
-			if (empty($this->thirdparty)) $this->fetch_thirdparty();
+			if (empty($this->thirdparty)) {
+				$this->fetch_thirdparty();
+			}
 
 			$maxfacnumber = $this->getNextNumRef($this->thirdparty,'last');
 			$ventilExportCompta = $this->getVentilExportCompta();
 
 			// If there is no invoice into the reset range and not already dispatched, we can delete
-			if ($maxfacnumber == '' && $ventilExportCompta == 0) return 3;
+			if ($maxfacnumber == '' && $ventilExportCompta == 0) {
+				return 3;
+			}
 			// If invoice to delete is last one and not already dispatched, we can delete
-			if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 4;
+			if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) {
+				return 4;
+			}
 
 			if ($this->situation_cycle_ref) {
 				$last = $this->is_last_in_cycle();
@@ -3442,18 +3663,30 @@ 
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql.= " f.rowid as fid, f.facnumber as ref, f.datef as df";
-		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."facture as f";
-		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 f.entity = ".$conf->entity;
 		$sql.= " AND f.fk_soc = s.rowid";
-		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 f.fk_statut = ".self::STATUS_DRAFT;
-		if (is_object($excluser)) $sql.= " AND f.fk_user_author <> ".$excluser->id;
+		}
+		if ($socid) {
+			$sql.= " AND s.rowid = ".$socid;
+		}
+		if ($draft) {
+			$sql.= " AND f.fk_statut = ".self::STATUS_DRAFT;
+		}
+		if (is_object($excluser)) {
+			$sql.= " AND f.fk_user_author <> ".$excluser->id;
+		}
 		$sql.= $this->db->order($sortfield,$sortorder);
 		$sql.= $this->db->plimit($limit,$offset);
 
@@ -3471,12 +3704,10 @@ 
 					if ($shortlist == 1)
 					{
 						$ga[$obj->fid] = $obj->ref;
-					}
-					else if ($shortlist == 2)
+					} else if ($shortlist == 2)
 					{
 						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
+					} else
 					{
 						$ga[$i]['id']	= $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
@@ -3486,8 +3717,7 @@ 
 				}
 			}
 			return $ga;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3518,7 +3748,9 @@ 
 		$sql.= " AND f.paye = 0";					// Pas classee payee completement
 		$sql.= " AND pf.fk_paiement IS NULL";		// Aucun paiement deja fait
 		$sql.= " AND ff.fk_statut IS NULL";			// Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql.=" AND f.fk_soc = ".$socid;
+		}
 		$sql.= " ORDER BY f.facnumber";
 
 		dol_syslog(get_class($this)."::list_replacable_invoices", LOG_DEBUG);
@@ -3533,8 +3765,7 @@ 
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -3567,7 +3798,9 @@ 
 		//	$sql.= " OR f.close_code IS NOT NULL)";	// Classee payee partiellement
 		$sql.= " AND ff.type IS NULL";			// Renvoi vrai si pas facture de remplacement
 		$sql.= " AND f.type != ".self::TYPE_CREDIT_NOTE;				// Type non 2 si facture non avoir
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql.=" AND f.fk_soc = ".$socid;
+		}
 		$sql.= " ORDER BY f.facnumber";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_invoices", LOG_DEBUG);
@@ -3577,8 +3810,12 @@ 
 			while ($obj=$this->db->fetch_object($resql))
 			{
 				$qualified=0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified=1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified=1;
+				if ($obj->fk_statut == self::STATUS_VALIDATED) {
+					$qualified=1;
+				}
+				if ($obj->fk_statut == self::STATUS_CLOSED) {
+					$qualified=1;
+				}
 				if ($qualified)
 				{
 					//$ref=$obj->facnumber;
@@ -3588,8 +3825,7 @@ 
 			}
 
 			return $return;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -3641,7 +3877,9 @@ 
                     // For example print 239.2 - 229.3 - 9.9; does not return 0.
                     //$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
                     //$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
+					if (empty($amount)) {
+						$amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
+					}
 
 					if (is_numeric($amount) && $amount != 0)
 					{
@@ -3664,8 +3902,7 @@ 
 						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
 						    $error++;
 						}
-					}
-					else
+					} else
 					{
 						$this->error='WithdrawRequestErrorNilAmount';
 	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
@@ -3682,24 +3919,23 @@ 
         				}
         			}
 
-                    if ($error) return -1;
+                    if ($error) {
+                    	return -1;
+                    }
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->error="A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
                     return 0;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
                 dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
                 return -2;
             }
-        }
-        else
+        } else
         {
             $this->error="Status of invoice does not allow this";
             dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
@@ -3722,8 +3958,7 @@ 
 		if ( $this->db->query($sql) )
 		{
 			return 0;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error);
@@ -3755,7 +3990,9 @@ 
 		$sql.= $clause." f.paye=0";
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND f.fk_statut = ".self::STATUS_VALIDATED;
-		if ($user->societe_id) $sql.= " AND f.fk_soc = ".$user->societe_id;
+		if ($user->societe_id) {
+			$sql.= " AND f.fk_soc = ".$user->societe_id;
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -3784,8 +4021,7 @@ 
 			}
 
 			return $response;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -3889,9 +4125,11 @@ 
 				$line->localtax1_tx=0;
 				$line->localtax2_tx=0;
 				$line->remise_percent=0;
-				if ($xnbp == 1)        // Qty is negative (product line)
+				if ($xnbp == 1) {
+					// Qty is negative (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
+				}
 					$line->fk_product=$prodids[$prodid];
 					$line->qty=-1;
 					$line->total_ht=-100;
@@ -3900,10 +4138,11 @@ 
 					$line->multicurrency_total_ht=-200;
 					$line->multicurrency_total_ttc=-239.2;
 					$line->multicurrency_total_tva=-39.2;
-				}
-				else if ($xnbp == 2)    // UP is negative (free line)
+				} else if ($xnbp == 2) {
+					// UP is negative (free line)
 				{
 					$line->subprice=-100;
+				}
 					$line->total_ht=-100;
 					$line->total_ttc=-119.6;
 					$line->total_tva=-19.6;
@@ -3911,10 +4150,11 @@ 
 					$line->multicurrency_total_ht=-200;
 					$line->multicurrency_total_ttc=-239.2;
 					$line->multicurrency_total_tva=-39.2;
-				}
-				else if ($xnbp == 3)    // Discount is 50% (product line)
+				} else if ($xnbp == 3) {
+					// Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
+				}
 					$line->fk_product=$prodids[$prodid];
 					$line->total_ht=50;
 					$line->total_ttc=59.8;
@@ -3923,8 +4163,7 @@ 
 					$line->multicurrency_total_ttc=119.6;
 					$line->multicurrency_total_tva=19.6;
 					$line->remise_percent=50;
-				}
-				else    // (product line)
+				} else    // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product=$prodids[$prodid];
@@ -4008,8 +4247,7 @@ 
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -4156,7 +4394,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('BILL_MODIFY',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -4164,8 +4404,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -4235,7 +4474,9 @@ 
 		$now = dol_now();
 
 		// Paid invoices have status STATUS_CLOSED
-		if ($this->statut != Facture::STATUS_VALIDATED) return false;
+		if ($this->statut != Facture::STATUS_VALIDATED) {
+			return false;
+		}
 
 		return $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
 	}
@@ -4407,8 +4648,7 @@ 
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
+		} else
 		{
 		    $this->error = $this->db->lasterror();
 			return -1;
@@ -4434,27 +4674,67 @@ 
 
 		// Clean parameters
 		$this->desc=trim($this->desc);
-		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_percent)) $this->remise_percent=0;
-		if (empty($this->info_bits)) $this->info_bits=0;
-		if (empty($this->subprice)) $this->subprice=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_prev_id)) $this->fk_prev_id = 'null';
-		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-
-		if (empty($this->pa_ht)) $this->pa_ht=0;
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=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_percent)) {
+			$this->remise_percent=0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits=0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice=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_prev_id)) {
+			$this->fk_prev_id = 'null';
+		}
+		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
+
+		if (empty($this->pa_ht)) {
+			$this->pa_ht=0;
+		}
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice=0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht=0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva=0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc=0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4462,8 +4742,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -4548,9 +4827,11 @@ 
 		{
 			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
 
-            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)
             	{
@@ -4579,8 +4860,7 @@ 
     							$this->db->rollback();
     							return -3;
 						    }
-						}
-						else
+						} else
 						{
 							$result=$discount->link_to_invoice($this->rowid,0);
 							if ($result < 0)
@@ -4591,16 +4871,14 @@ 
 								return -3;
 							}
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
 						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$discount->error;
 					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
@@ -4624,8 +4902,7 @@ 
 			$this->db->commit();
 			return $this->rowid;
 
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4650,28 +4927,66 @@ 
 
 		// Clean parameters
 		$this->desc=trim($this->desc);
-		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->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->product_type)) $this->product_type=0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-		if (empty($this->pa_ht)) $this->pa_ht=0;
-
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=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->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->product_type)) {
+			$this->product_type=0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line=0;
+		}
+		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht=0;
+		}
+
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice=0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht=0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva=0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc=0;
+		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4679,8 +4994,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -4694,8 +5008,11 @@ 
         $sql.= ", label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
         $sql.= ", subprice=".price2num($this->subprice)."";
         $sql.= ", remise_percent=".price2num($this->remise_percent)."";
-        if ($this->fk_remise_except) $sql.= ", fk_remise_except=".$this->fk_remise_except;
-        else $sql.= ", fk_remise_except=null";
+        if ($this->fk_remise_except) {
+        	$sql.= ", fk_remise_except=".$this->fk_remise_except;
+        } else {
+        	$sql.= ", fk_remise_except=null";
+        }
 		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->db->escape($this->vat_src_code))."'";
         $sql.= ", tva_tx=".price2num($this->tva_tx)."";
         $sql.= ", localtax1_tx=".price2num($this->localtax1_tx)."";
@@ -4719,7 +5036,9 @@ 
 		$sql.= ", fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null");
 		$sql.= ", buy_price_ht='".price2num($this->pa_ht)."'";
 		$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.= ", situation_percent=" . $this->situation_percent;
 		$sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 		$sql.= ", fk_user_modif =".$user->id;
@@ -4736,9 +5055,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)
         		{
@@ -4759,8 +5080,7 @@ 
 			}
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4796,8 +5116,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." sql=".$sql;
 			$this->db->rollback();
@@ -4816,8 +5135,12 @@ 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		// Clean parameters
-		if (empty($this->total_localtax1)) $this->total_localtax1=0;
-		if (empty($this->total_localtax2)) $this->total_localtax2=0;
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1=0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2=0;
+		}
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
@@ -4835,8 +5158,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4859,7 +5181,9 @@ 
 		    // If invoice is a not a situation invoice, this->fk_prev_id is used for something else
             $tmpinvoice=new Facture($this->db);
             $tmpinvoice->fetch($invoiceid);
-            if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0;
+            if ($tmpinvoice->type != Facture::TYPE_SITUATION) {
+            	return 0;
+            }
 
 			$sql = 'SELECT situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet WHERE rowid=' . $this->fk_prev_id;
 			$resql = $this->db->query($sql);

htdocs/accountancy/class/bookkeeping.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -1511,9 +1511,9 @@
 	/**
 	 * Transform transaction
 	 *
-	 * @param  number   $direction     If 0 tmp => real, if 1 real => tmp
+	 * @param  integer   $direction     If 0 tmp => real, if 1 real => tmp
 	 * @param  string   $piece_num     Piece num
-	 * @return void
+	 * @return integer
 	 */
 	public function transformTransaction($direction=0,$piece_num='') {
 		$this->db->begin();

Indentation +12 added lines, -12 removed lines

@@ -435,7 +435,7 @@ 
 
 		$now = dol_now();
 		if (empty($this->date_create)) {
-		    $this->date_create = $now;
+			$this->date_create = $now;
 		}
 
 		// Check parameters
@@ -1596,17 +1596,17 @@ 
 	}
 
 	/**
-	* Return list of accounts with label by chart of accounts
-	*
-	* @param string		$selectid	Preselected chart of accounts
-	* @param string		$htmlname	Name of field in html form
-	* @param int		$showempty	Add an empty field
-	* @param array		$event		Event options
-	* @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
-	* @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
-	* @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
-	* @return string	String with HTML select
-	*/
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string		$selectid	Preselected chart of accounts
+	 * @param string		$htmlname	Name of field in html form
+	 * @param int		$showempty	Add an empty field
+	 * @param array		$event		Event options
+	 * @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
+	 * @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
+	 * @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
+	 * @return string	String with HTML select
+	 */
 	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
 		global $conf;
 

Braces +27 added lines, -11 removed lines

@@ -172,8 +172,12 @@ 
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		if (empty($this->debit)) $this->debit = 0;
-		if (empty($this->credit)) $this->credit = 0;
+		if (empty($this->debit)) {
+			$this->debit = 0;
+		}
+		if (empty($this->credit)) {
+			$this->credit = 0;
+		}
 
 		// Check parameters
 		if (empty($this->numero_compte) || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined')
@@ -182,8 +186,7 @@ 
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
 				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
-			}
-			else
+			} else
 			{
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
 				$mesg=$this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
@@ -427,8 +430,12 @@ 
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		if (empty($this->debit)) $this->debit = 0;
-		if (empty($this->credit)) $this->credit = 0;
+		if (empty($this->debit)) {
+			$this->debit = 0;
+		}
+		if (empty($this->credit)) {
+			$this->credit = 0;
+		}
 
 		$this->debit = price2num($this->debit, 'MT');
 		$this->credit = price2num($this->credit, 'MT');
@@ -1195,8 +1202,13 @@ 
 		$sql = "DELETE";
 		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql.= " WHERE 1 = 1";
-		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;		 // FIXME Must use between
-		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
+		if (! empty($delyear)) {
+			$sql.= " AND YEAR(doc_date) = " . $delyear;
+		}
+		// FIXME Must use between
+		if (! empty($journal)) {
+			$sql.= " AND code_journal = '".$journal."'";
+		}
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		$resql = $this->db->query($sql);
 
@@ -1381,8 +1393,12 @@ 
 
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj) $result = $obj->max;
-			if (empty($result)) $result = 1;
+			if ($obj) {
+				$result = $obj->max;
+			}
+			if (empty($result)) {
+				$result = 1;
+			}
 			return $result;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
@@ -1733,7 +1749,7 @@ 
 			}
 			if(empty($obj->category)){
 				return $obj->label;
-			}else{
+			} else{
 				return $obj->label.' ('.$obj->category.')';
 			}
 		} else {

Spacing +341 added lines, -341 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * Class to manage Ledger (General Ledger and Subledger)
@@ -43,7 +43,7 @@ 
 	 *
 	 * @var string[] Error codes (or messages)
 	 */
-	public $errors = array ();
+	public $errors = array();
 	/**
 	 *
 	 * @var string Id to identify managed objects
@@ -61,7 +61,7 @@ 
 	 *
 	 * @var BookKeepingLine[] Lines
 	 */
-	public $lines = array ();
+	public $lines = array();
 
 	/**
 	 *
@@ -182,17 +182,17 @@ 
 			$langs->load("errors");
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
-				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
+				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
 			}
 			else
 			{
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
-				$mesg=$this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
+				$mesg = $this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
 				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
 				{
-					$mesg.=', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
+					$mesg .= ', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
 				}
-				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
+				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
 			}
 
 			return -1;
@@ -204,12 +204,12 @@ 
 
 		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
-		$sql .= " AND fk_doc = " . $this->fk_doc;
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;					// This field can be 0 is record is for several lines
-		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE doc_type = '".$this->db->escape($this->doc_type)."'";
+		$sql .= " AND fk_doc = ".$this->fk_doc;
+		$sql .= " AND fk_docdet = ".$this->fk_docdet; // This field can be 0 is record is for several lines
+		$sql .= " AND numero_compte = '".$this->db->escape($this->numero_compte)."'";
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
 		$resql = $this->db->query($sql);
 
@@ -219,32 +219,32 @@ 
 			{
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
-				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank'
-				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);				// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
-				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
-				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
+				$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+				$sqlnum .= " WHERE doc_type = '".$this->db->escape($this->doc_type)."'"; // For example doc_type = 'bank'
+				$sqlnum .= " AND fk_docdet = ".$this->db->escape($this->fk_docdet); // fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
+				$sqlnum .= " AND doc_ref = '".$this->db->escape($this->doc_ref)."'"; // ref of source object
+				$sqlnum .= " AND entity IN (".getEntity('accountancy').")";
 
-				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
+				dol_syslog(get_class($this).":: create sqlnum=".$sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
 				if ($resqlnum) {
 					$objnum = $this->db->fetch_object($resqlnum);
 					$this->piece_num = $objnum->piece_num;
 				}
-				dol_syslog(get_class($this) . ":: create this->piece_num=" . $this->piece_num, LOG_DEBUG);
+				dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
-					$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-					$sqlnum .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+					$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+					$sqlnum .= " WHERE entity IN (".getEntity('accountancy').")";
 
-					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
+					dol_syslog(get_class($this).":: create sqlnum=".$sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
 						$objnum = $this->db->fetch_object($resqlnum);
 						$this->piece_num = $objnum->maxpiecenum;
 					}
 				}
-				dol_syslog(get_class($this) . ":: create this->piece_num=" . $this->piece_num, LOG_DEBUG);
+				dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
 				if (empty($this->piece_num)) {
 					$this->piece_num = 1;
 				}
@@ -254,7 +254,7 @@ 
 					$this->date_create = $now;
 				}
 
-				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
 				$sql .= "doc_date";
 				$sql .= ", date_lim_reglement";
 				$sql .= ", doc_type";
@@ -278,66 +278,66 @@ 
 				$sql .= ", piece_num";
 				$sql .= ', entity';
 				$sql .= ") VALUES (";
-				$sql .= "'" . $this->db->idate($this->doc_date) . "'";
-				$sql .= ",'" . $this->db->idate($this->date_lim_reglement) . "'";
-				$sql .= ",'" . $this->db->escape($this->doc_type) . "'";
-				$sql .= ",'" . $this->db->escape($this->doc_ref) . "'";
-				$sql .= "," . $this->fk_doc;
-				$sql .= "," . $this->fk_docdet;
-				$sql .= ",'" . $this->db->escape($this->thirdparty_code) . "'";
-				$sql .= ",'" . $this->db->escape($this->subledger_account) . "'";
-				$sql .= ",'" . $this->db->escape($this->subledger_label) . "'";
-				$sql .= ",'" . $this->db->escape($this->numero_compte) . "'";
-				$sql .= ",'" . $this->db->escape($this->label_compte) . "'";
-				$sql .= ",'" . $this->db->escape($this->label_operation) . "'";
-				$sql .= "," . $this->debit;
-				$sql .= "," . $this->credit;
-				$sql .= "," . $this->montant;
-				$sql .= ",'" . $this->db->escape($this->sens) . "'";
-				$sql .= ",'" . $this->db->escape($this->fk_user_author) . "'";
-				$sql .= ",'" . $this->db->idate($this->date_create). "'";
-				$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
-				$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
-				$sql .= "," . $this->db->escape($this->piece_num);
-				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
+				$sql .= "'".$this->db->idate($this->doc_date)."'";
+				$sql .= ",'".$this->db->idate($this->date_lim_reglement)."'";
+				$sql .= ",'".$this->db->escape($this->doc_type)."'";
+				$sql .= ",'".$this->db->escape($this->doc_ref)."'";
+				$sql .= ",".$this->fk_doc;
+				$sql .= ",".$this->fk_docdet;
+				$sql .= ",'".$this->db->escape($this->thirdparty_code)."'";
+				$sql .= ",'".$this->db->escape($this->subledger_account)."'";
+				$sql .= ",'".$this->db->escape($this->subledger_label)."'";
+				$sql .= ",'".$this->db->escape($this->numero_compte)."'";
+				$sql .= ",'".$this->db->escape($this->label_compte)."'";
+				$sql .= ",'".$this->db->escape($this->label_operation)."'";
+				$sql .= ",".$this->debit;
+				$sql .= ",".$this->credit;
+				$sql .= ",".$this->montant;
+				$sql .= ",'".$this->db->escape($this->sens)."'";
+				$sql .= ",'".$this->db->escape($this->fk_user_author)."'";
+				$sql .= ",'".$this->db->idate($this->date_create)."'";
+				$sql .= ",'".$this->db->escape($this->code_journal)."'";
+				$sql .= ",'".$this->db->escape($this->journal_label)."'";
+				$sql .= ",".$this->db->escape($this->piece_num);
+				$sql .= ", ".(!isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
 
-				dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
+				dol_syslog(get_class($this).":: create sql=".$sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
-					$id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+					$id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 					if ($id > 0) {
 						$this->id = $id;
 						$result = 0;
 					} else {
 						$result = -2;
-						$error ++;
-						$this->errors[] = 'Error Create Error ' . $result . ' lecture ID';
-						dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+						$error++;
+						$this->errors[] = 'Error Create Error '.$result.' lecture ID';
+						dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 					}
 				} else {
 					$result = -1;
-					$error ++;
-					$this->errors[] = 'Error ' . $this->db->lasterror();
-					dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 				}
 			} else {	// Already exists
 				$result = -3;
 				$error++;
-				$this->error='BookkeepingRecordAlreadyExists';
-				dol_syslog(__METHOD__ . ' ' . $this->error, LOG_WARNING);
+				$this->error = 'BookkeepingRecordAlreadyExists';
+				dol_syslog(__METHOD__.' '.$this->error, LOG_WARNING);
 			}
 		} else {
 			$result = -5;
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
 
-		if (! $error) {
+		if (!$error) {
 
-			if (! $notrigger) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
 
@@ -366,7 +366,7 @@ 
 	 * @param  string  $mode 	   Mode
 	 * @return int				 <0 if KO, Id of created object if OK
 	 */
-	public function createStd(User $user, $notrigger = false, $mode='') {
+	public function createStd(User $user, $notrigger = false, $mode = '') {
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -445,7 +445,7 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . $mode.'(';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.$mode.'(';
 		$sql .= 'doc_date,';
 		$sql .= 'date_lim_reglement,';
 		$sql .= 'doc_type,';
@@ -469,43 +469,43 @@ 
 		$sql .= 'piece_num,';
 		$sql .= 'entity';
 		$sql .= ') VALUES (';
-		$sql .= ' ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->doc_date) . "'") . ',';
-		$sql .= ' ' . (! isset($this->date_lim_reglement) || dol_strlen($this->date_lim_reglement) == 0 ? 'NULL' : "'" . $this->db->idate($this->date_lim_reglement) . "'") . ',';
-		$sql .= ' ' . (! isset($this->doc_type) ? 'NULL' : "'" . $this->db->escape($this->doc_type) . "'") . ',';
-		$sql .= ' ' . (! isset($this->doc_ref) ? 'NULL' : "'" . $this->db->escape($this->doc_ref) . "'") . ',';
-		$sql .= ' ' . (empty($this->fk_doc) ? '0' : $this->fk_doc) . ',';
-		$sql .= ' ' . (empty($this->fk_docdet) ? '0' : $this->fk_docdet) . ',';
-		$sql .= ' ' . (! isset($this->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
-		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
-		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
-		$sql .= ' ' . (! isset($this->numero_compte) ? 'NULL' : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
-		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
-		$sql .= ' ' . (! isset($this->label_operation) ? 'NULL' : "'" . $this->db->escape($this->label_operation) . "'") . ',';
-		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
-		$sql .= ' ' . (! isset($this->credit) ? 'NULL' : $this->credit ). ',';
-		$sql .= ' ' . (! isset($this->montant) ? 'NULL' : $this->montant ). ',';
-		$sql .= ' ' . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ',';
-		$sql .= ' ' . $user->id . ',';
-		$sql .= ' ' . "'" . $this->db->idate($this->date_create) . "',";
-		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
-		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
-		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
-		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
+		$sql .= ' '.(!isset($this->doc_date) || dol_strlen($this->doc_date) == 0 ? 'NULL' : "'".$this->db->idate($this->doc_date)."'").',';
+		$sql .= ' '.(!isset($this->date_lim_reglement) || dol_strlen($this->date_lim_reglement) == 0 ? 'NULL' : "'".$this->db->idate($this->date_lim_reglement)."'").',';
+		$sql .= ' '.(!isset($this->doc_type) ? 'NULL' : "'".$this->db->escape($this->doc_type)."'").',';
+		$sql .= ' '.(!isset($this->doc_ref) ? 'NULL' : "'".$this->db->escape($this->doc_ref)."'").',';
+		$sql .= ' '.(empty($this->fk_doc) ? '0' : $this->fk_doc).',';
+		$sql .= ' '.(empty($this->fk_docdet) ? '0' : $this->fk_docdet).',';
+		$sql .= ' '.(!isset($this->thirdparty_code) ? 'NULL' : "'".$this->db->escape($this->thirdparty_code)."'").',';
+		$sql .= ' '.(!isset($this->subledger_account) ? 'NULL' : "'".$this->db->escape($this->subledger_account)."'").',';
+		$sql .= ' '.(!isset($this->subledger_label) ? 'NULL' : "'".$this->db->escape($this->subledger_label)."'").',';
+		$sql .= ' '.(!isset($this->numero_compte) ? 'NULL' : "'".$this->db->escape($this->numero_compte)."'").',';
+		$sql .= ' '.(!isset($this->label_compte) ? 'NULL' : "'".$this->db->escape($this->label_compte)."'").',';
+		$sql .= ' '.(!isset($this->label_operation) ? 'NULL' : "'".$this->db->escape($this->label_operation)."'").',';
+		$sql .= ' '.(!isset($this->debit) ? 'NULL' : $this->debit).',';
+		$sql .= ' '.(!isset($this->credit) ? 'NULL' : $this->credit).',';
+		$sql .= ' '.(!isset($this->montant) ? 'NULL' : $this->montant).',';
+		$sql .= ' '.(!isset($this->sens) ? 'NULL' : "'".$this->db->escape($this->sens)."'").',';
+		$sql .= ' '.$user->id.',';
+		$sql .= ' '."'".$this->db->idate($this->date_create)."',";
+		$sql .= ' '.(empty($this->code_journal) ? 'NULL' : "'".$this->db->escape($this->code_journal)."'").',';
+		$sql .= ' '.(empty($this->journal_label) ? 'NULL' : "'".$this->db->escape($this->journal_label)."'").',';
+		$sql .= ' '.(empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
+		$sql .= ' '.(!isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
 
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-			if (! $notrigger) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
 
@@ -520,7 +520,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -537,7 +537,7 @@ 
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = null, $mode='') {
+	public function fetch($id, $ref = null, $mode = '') {
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -565,13 +565,13 @@ 
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element.$mode. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.$mode.' as t';
 		$sql .= ' WHERE 1 = 1';
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (null !== $ref) {
-			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
+			$sql .= ' AND t.ref = '.'\''.$ref.'\'';
 		} else {
-			$sql .= ' AND t.rowid = ' . $id;
+			$sql .= ' AND t.rowid = '.$id;
 		}
 
 		$resql = $this->db->query($sql);
@@ -612,10 +612,10 @@ 
 				return 0;
 			}
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -660,47 +660,47 @@ 
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		// Manage filter
-		$sqlwhere = array ();
+		$sqlwhere = array();
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
+					$sqlwhere[] = $key.'=\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
+					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key . '=' . $value;
+					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.label_operation') {
-					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} else {
-					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
 		}
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE 1 = 1';
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
+			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		// Affichage par compte comptable
 		$sql .= ' ORDER BY t.numero_compte ASC';
-		if (! empty($sortfield)) {
-			$sql .= ', ' . $sortfield . ' ' .$sortorder;
+		if (!empty($sortfield)) {
+			$sql .= ', '.$sortfield.' '.$sortorder;
 		}
-		if (! empty($limit)) {
-			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
 		}
-		$this->lines = array ();
+		$this->lines = array();
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new BookKeepingLine();
 
 				$line->id = $obj->rowid;
@@ -732,10 +732,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -778,37 +778,37 @@ 
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
-		$sqlwhere = array ();
+		$sqlwhere = array();
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
+					$sqlwhere[] = $key.'=\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
+					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key . '=' . $value;
+					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} else {
-					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
 		}
-		$sql.= ' WHERE 1 = 1';
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= ' WHERE 1 = 1';
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
+			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 
-		if (! empty($sortfield)) {
+		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
-		if (! empty($limit)) {
-			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array();
 
@@ -816,7 +816,7 @@ 
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new BookKeepingLine();
 
 				$line->id = $obj->rowid;
@@ -848,10 +848,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -876,49 +876,49 @@ 
 		$sql .= " t.numero_compte,";
 		$sql .= " SUM(t.debit) as debit,";
 		$sql .= " SUM(t.credit) as credit";
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
-		$sqlwhere = array ();
+		$sqlwhere = array();
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
+					$sqlwhere[] = $key.'=\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
+					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key . '=' . $value;
+					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.subledger_label') {
-					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} else {
-					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
 		}
-		$sql.= ' WHERE 1 = 1';
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= ' WHERE 1 = 1';
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
+			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 
 		$sql .= ' GROUP BY t.numero_compte';
 
-		if (! empty($sortfield)) {
+		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
-		if (! empty($limit)) {
-			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
 		}
-		$this->lines = array ();
+		$this->lines = array();
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new BookKeepingLine();
 
 				$line->numero_compte = $obj->numero_compte;
@@ -930,10 +930,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -945,7 +945,7 @@ 
 	 * @param  string  $mode       Mode
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false, $mode='') {
+	public function update(User $user, $notrigger = false, $mode = '') {
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1016,39 +1016,39 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . $mode.' SET';
-		$sql .= ' doc_date = ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) != 0 ? "'" . $this->db->idate($this->doc_date) . "'" : 'null') . ',';
-		$sql .= ' doc_type = ' . (isset($this->doc_type) ? "'" . $this->db->escape($this->doc_type) . "'" : "null") . ',';
-		$sql .= ' doc_ref = ' . (isset($this->doc_ref) ? "'" . $this->db->escape($this->doc_ref) . "'" : "null") . ',';
-		$sql .= ' fk_doc = ' . (isset($this->fk_doc) ? $this->fk_doc : "null") . ',';
-		$sql .= ' fk_docdet = ' . (isset($this->fk_docdet) ? $this->fk_docdet : "null") . ',';
-		$sql .= ' thirdparty_code = ' . (isset($this->thirdparty_code) ? "'" . $this->db->escape($this->thirdparty_code) . "'" : "null") . ',';
-		$sql .= ' subledger_account = ' . (isset($this->subledger_account) ? "'" . $this->db->escape($this->subledger_account) . "'" : "null") . ',';
-		$sql .= ' subledger_label = ' . (isset($this->subledger_label) ? "'" . $this->db->escape($this->subledger_label) . "'" : "null") . ',';
-		$sql .= ' numero_compte = ' . (isset($this->numero_compte) ? "'" . $this->db->escape($this->numero_compte) . "'" : "null") . ',';
-		$sql .= ' label_compte = ' . (isset($this->label_compte) ? "'" . $this->db->escape($this->label_compte) . "'" : "null") . ',';
-		$sql .= ' label_operation = ' . (isset($this->label_operation) ? "'" . $this->db->escape($this->label_operation) . "'" : "null") . ',';
-		$sql .= ' debit = ' . (isset($this->debit) ? $this->debit : "null") . ',';
-		$sql .= ' credit = ' . (isset($this->credit) ? $this->credit : "null") . ',';
-		$sql .= ' montant = ' . (isset($this->montant) ? $this->montant : "null") . ',';
-		$sql .= ' sens = ' . (isset($this->sens) ? "'" . $this->db->escape($this->sens) . "'" : "null") . ',';
-		$sql .= ' fk_user_author = ' . (isset($this->fk_user_author) ? $this->fk_user_author : "null") . ',';
-		$sql .= ' import_key = ' . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . ',';
-		$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
-		$sql .= ' journal_label = ' . (isset($this->journal_label) ? "'" . $this->db->escape($this->journal_label) . "'" : "null") . ',';
-		$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
-		$sql .= ' WHERE rowid=' . $this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.$mode.' SET';
+		$sql .= ' doc_date = '.(!isset($this->doc_date) || dol_strlen($this->doc_date) != 0 ? "'".$this->db->idate($this->doc_date)."'" : 'null').',';
+		$sql .= ' doc_type = '.(isset($this->doc_type) ? "'".$this->db->escape($this->doc_type)."'" : "null").',';
+		$sql .= ' doc_ref = '.(isset($this->doc_ref) ? "'".$this->db->escape($this->doc_ref)."'" : "null").',';
+		$sql .= ' fk_doc = '.(isset($this->fk_doc) ? $this->fk_doc : "null").',';
+		$sql .= ' fk_docdet = '.(isset($this->fk_docdet) ? $this->fk_docdet : "null").',';
+		$sql .= ' thirdparty_code = '.(isset($this->thirdparty_code) ? "'".$this->db->escape($this->thirdparty_code)."'" : "null").',';
+		$sql .= ' subledger_account = '.(isset($this->subledger_account) ? "'".$this->db->escape($this->subledger_account)."'" : "null").',';
+		$sql .= ' subledger_label = '.(isset($this->subledger_label) ? "'".$this->db->escape($this->subledger_label)."'" : "null").',';
+		$sql .= ' numero_compte = '.(isset($this->numero_compte) ? "'".$this->db->escape($this->numero_compte)."'" : "null").',';
+		$sql .= ' label_compte = '.(isset($this->label_compte) ? "'".$this->db->escape($this->label_compte)."'" : "null").',';
+		$sql .= ' label_operation = '.(isset($this->label_operation) ? "'".$this->db->escape($this->label_operation)."'" : "null").',';
+		$sql .= ' debit = '.(isset($this->debit) ? $this->debit : "null").',';
+		$sql .= ' credit = '.(isset($this->credit) ? $this->credit : "null").',';
+		$sql .= ' montant = '.(isset($this->montant) ? $this->montant : "null").',';
+		$sql .= ' sens = '.(isset($this->sens) ? "'".$this->db->escape($this->sens)."'" : "null").',';
+		$sql .= ' fk_user_author = '.(isset($this->fk_user_author) ? $this->fk_user_author : "null").',';
+		$sql .= ' import_key = '.(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null").',';
+		$sql .= ' code_journal = '.(isset($this->code_journal) ? "'".$this->db->escape($this->code_journal)."'" : "null").',';
+		$sql .= ' journal_label = '.(isset($this->journal_label) ? "'".$this->db->escape($this->journal_label)."'" : "null").',';
+		$sql .= ' piece_num = '.(isset($this->piece_num) ? $this->piece_num : "null");
+		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
 
-		if (! $error && ! $notrigger) {
+		if (!$error && !$notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
 
@@ -1062,7 +1062,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -1079,22 +1079,22 @@ 
 	 * @param  string  $mode           Mode
 	 * @return number                  <0 if KO, >0 if OK
 	 */
-	public function updateByMvt($piece_num='', $field='', $value='', $mode='') {
+	public function updateByMvt($piece_num = '', $field = '', $value = '', $mode = '') {
 		$this->db->begin();
-		$sql = "UPDATE " . MAIN_DB_PREFIX .  $this->table_element . $mode . " as ab";
-		$sql .= ' SET ab.' . $field . '=' . (is_numeric($value)?$value:"'".$value."'");
-		$sql .= ' WHERE ab.piece_num=' . $piece_num ;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element.$mode." as ab";
+		$sql .= ' SET ab.'.$field.'='.(is_numeric($value) ? $value : "'".$value."'");
+		$sql .= ' WHERE ab.piece_num='.$piece_num;
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -1110,15 +1110,15 @@ 
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false, $mode='') {
+	public function delete(User $user, $notrigger = false, $mode = '') {
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -1129,15 +1129,15 @@ 
 			}
 		}
 
-		if (! $error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element.$mode;
-			$sql .= ' WHERE rowid=' . $this->id;
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.$mode;
+			$sql .= ' WHERE rowid='.$this->id;
 
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -1145,7 +1145,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -1164,16 +1164,16 @@ 
 
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE import_key = '" . $importkey . "'";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE import_key = '".$importkey."'";
 
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this)."::delete Error " . $this->db->lasterror(), LOG_ERR);
+		if (!$resql) {
+			$this->errors[] = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::delete Error ".$this->db->lasterror(), LOG_ERR);
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 
 		$this->db->commit();
@@ -1188,7 +1188,7 @@ 
 	 * @param  string $mode 		Mode
 	 * @return int					<0 if KO, >0 if OK
 	 */
-	function deleteByYearAndJournal($delyear='', $journal='', $mode='') {
+	function deleteByYearAndJournal($delyear = '', $journal = '', $mode = '') {
 		global $conf;
 
 		if (empty($delyear) && empty($journal))
@@ -1200,18 +1200,18 @@ 
 
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
-		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
-		$sql.= " WHERE 1 = 1";
-		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;		 // FIXME Must use between
-		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
+		$sql .= " WHERE 1 = 1";
+		if (!empty($delyear)) $sql .= " AND YEAR(doc_date) = ".$delyear; // FIXME Must use between
+		if (!empty($journal)) $sql .= " AND code_journal = '".$journal."'";
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+		if (!$resql) {
+			$this->errors[] = "Error ".$this->db->lasterror();
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1;
@@ -1234,20 +1234,20 @@ 
 
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE piece_num = ".$piecenum;
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+		if (!$resql) {
+			$this->errors[] = "Error ".$this->db->lasterror();
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 
 		$this->db->commit();
@@ -1283,20 +1283,20 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
 
 		// End
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 
 			return $object->id;
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -1309,7 +1309,7 @@ 
 	public function initAsSpecimen() {
 		global $user;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->id = 0;
 		$this->doc_date = $now;
@@ -1341,15 +1341,15 @@ 
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchPerMvt($piecenum, $mode='') {
+	public function fetchPerMvt($piecenum, $mode = '') {
 		global $conf;
 
 		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
-		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
+		$sql .= " WHERE piece_num = ".$piecenum;
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
@@ -1361,9 +1361,9 @@ 
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
 		}
 
 		return 1;
@@ -1375,14 +1375,14 @@ 
 	 * @param	string	$mode	Mode
 	 * @return	string			Next numero to use
 	 */
-	public function getNextNumMvt($mode='')
+	public function getNextNumMvt($mode = '')
 	{
 		global $conf;
 
-		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
-		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+		$sql = "SELECT MAX(piece_num)+1 as max FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
+		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."getNextNumMvt sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		if ($result) {
@@ -1391,9 +1391,9 @@ 
 			if (empty($result)) $result = 1;
 			return $result;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::getNextNumMvt " . $this->error, LOG_ERR);
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::getNextNumMvt ".$this->error, LOG_ERR);
+			return -1;
 		}
 	}
 
@@ -1404,22 +1404,22 @@ 
 	 * @param  string  $mode       Mode
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-	function fetchAllPerMvt($piecenum, $mode='') {
+	function fetchAllPerMvt($piecenum, $mode = '') {
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, label_operation, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
-		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
+		$sql .= " WHERE piece_num = ".$piecenum;
+		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 
-			while ( $obj = $this->db->fetch_object($result) ) {
+			while ($obj = $this->db->fetch_object($result)) {
 
 				$line = new BookKeepingLine();
 
@@ -1447,9 +1447,9 @@ 
 				$this->linesmvt[] = $line;
 			}
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
 		}
 
 		return 1;
@@ -1468,18 +1468,18 @@ 
 		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, label_operation, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
+		dol_syslog(get_class($this)."::export_bookkeping", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
-			$this->linesexport = array ();
+			$this->linesexport = array();
 
 			$num = $this->db->num_rows($resql);
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new BookKeepingLine();
 
 				$line->id = $obj->rowid;
@@ -1508,9 +1508,9 @@ 
 
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::export_bookkeping " . $this->error, LOG_ERR);
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::export_bookkeping ".$this->error, LOG_ERR);
+			return -1;
 		}
 	}
 
@@ -1521,14 +1521,14 @@ 
 	 * @param  string   $piece_num     Piece num
 	 * @return void
 	 */
-	public function transformTransaction($direction=0,$piece_num='') {
+	public function transformTransaction($direction = 0, $piece_num = '') {
 		$this->db->begin();
-		if ($direction==0) {
-			$next_piecenum=$this->getNextNumMvt();
+		if ($direction == 0) {
+			$next_piecenum = $this->getNextNumMvt();
 			if ($result < 0) {
 				$error++;
 			}
-			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'(doc_date, doc_type,';
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(doc_date, doc_type,';
 			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
@@ -1536,30 +1536,30 @@ 
 			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.$next_piecenum.'';
-			$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$piece_num;
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$piece_num;
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
 		}
-		if ($direction==1) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+		if ($direction == 1) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$piece_num;
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
-			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'_tmp(doc_date, doc_type,';
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'_tmp(doc_date, doc_type,';
 			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
@@ -1567,27 +1567,27 @@ 
 			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
-			$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.' WHERE piece_num = '.$piece_num;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.$piece_num;
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$piece_num;
 			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
 		}
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 		/*
 		$sql = "DELETE FROM ";
@@ -1616,26 +1616,26 @@ 
 	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
 		global $conf;
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
 		$sql = "SELECT DISTINCT ab.numero_compte as account_number, aa.label as label, aa.rowid as rowid, aa.fk_pcg_version";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.account_number = ab.numero_compte";
 		$sql .= " AND aa.active = 1";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $pcgver;
-		$sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = ".$pcgver;
+		$sql .= " AND ab.entity IN (".getEntity('accountancy').")";
 		$sql .= " ORDER BY account_number ASC";
 
-		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
-			return - 1;
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
+			return -1;
 		}
 
 		$out = ajax_combobox($htmlname, $event);
@@ -1644,7 +1644,7 @@ 
 		$selected = null;
 
 		while ($obj = $this->db->fetch_object($resql)) {
-			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+			$label = length_accountg($obj->account_number).' - '.$obj->label;
 
 			$select_value_in = $obj->rowid;
 			$select_value_out = $obj->rowid;
@@ -1682,17 +1682,17 @@ 
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
 		$sql  = "SELECT root.account_number, root.label as label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $pcgver;
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as parent ON aa.account_parent = parent.rowid";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as root ON parent.account_parent = root.rowid";
-		$sql .= " WHERE aa.account_number = '" . $account . "'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = ".$pcgver;
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid";
+		$sql .= " WHERE aa.account_number = '".$account."'";
 		$sql .= " AND parent.active = 1";
 		$sql .= " AND root.active = 1";
-		$sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND aa.entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_account sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = '';
@@ -1703,8 +1703,8 @@ 
 			return $obj->label;
 
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
 
 			return -1;
 		}
@@ -1722,29 +1722,29 @@ 
 
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 		$sql  = "SELECT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version, cat.label as category";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa ";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND aa.account_number = '" . $account . "'";
-		$sql .= " AND asy.rowid = " . $pcgver;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa ";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND aa.account_number = '".$account."'";
+		$sql .= " AND asy.rowid = ".$pcgver;
 		$sql .= " AND aa.active = 1";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-		$sql .= " WHERE aa.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
+		$sql .= " WHERE aa.entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_account sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 			}
-			if(empty($obj->category)){
+			if (empty($obj->category)) {
 				return $obj->label;
-			}else{
+			} else {
 				return $obj->label.' ('.$obj->category.')';
 			}
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}

htdocs/public/agenda/agendaexport.php

Indentation +7 added lines, -7 removed lines

@@ -108,12 +108,12 @@ 
 // Complete long filename
 foreach ($filters as $key => $value)
 {
-    //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
+	//if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
 	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
+	if ($key == 'id')              $filename.='-id'.$value;
+	if ($key == 'idfrom')          $filename.='-idfrom'.$value;
+	if ($key == 'idto')            $filename.='-idto'.$value;
+	if ($key == 'project')         $filename.='-project'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 }
@@ -127,7 +127,7 @@ 
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
@@ -162,7 +162,7 @@ 
 		$result=readfile($outputfile);
 		if (! $result) print 'File '.$outputfile.' was empty.';
 
-	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
+		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
 	else

Spacing +58 added lines, -58 removed lines

@@ -32,12 +32,12 @@ 
 //if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 //if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // C'est un wrapper, donc header vierge
 /**
@@ -57,27 +57,27 @@ 
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 // Security check
-if (empty($conf->agenda->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->agenda->enabled)) accessforbidden('', 0, 0, 1);
 
 // Not older than
-if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;	// default limit
+if (!isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY = 100; // default limit
 
 // Define format, type and filter
-$format='ical';
-$type='event';
-if (GETPOST("format",'alpha')) $format=GETPOST("format",'apha');
-if (GETPOST("type",'apha'))   $type=GETPOST("type",'alpha');
-
-$filters=array();
-if (GETPOST("year",'int')) 	        $filters['year']=GETPOST("year",'int');
-if (GETPOST("id",'int'))            $filters['id']=GETPOST("id",'int');
-if (GETPOST("idfrom",'int'))        $filters['idfrom']=GETPOST("idfrom",'int');
-if (GETPOST("idto",'int'))          $filters['idto']=GETPOST("idto",'int');
-if (GETPOST("project",'apha'))      $filters['project']=GETPOST("project",'apha');
-if (GETPOST("logina",'apha'))       $filters['logina']=GETPOST("logina",'apha');
-if (GETPOST("logint",'apha'))       $filters['logint']=GETPOST("logint",'apha');
-if (GETPOST("notolderthan",'int'))  $filters['notolderthan']=GETPOST("notolderthan","int");
-else $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+$format = 'ical';
+$type = 'event';
+if (GETPOST("format", 'alpha')) $format = GETPOST("format", 'apha');
+if (GETPOST("type", 'apha'))   $type = GETPOST("type", 'alpha');
+
+$filters = array();
+if (GETPOST("year", 'int')) 	        $filters['year'] = GETPOST("year", 'int');
+if (GETPOST("id", 'int'))            $filters['id'] = GETPOST("id", 'int');
+if (GETPOST("idfrom", 'int'))        $filters['idfrom'] = GETPOST("idfrom", 'int');
+if (GETPOST("idto", 'int'))          $filters['idto'] = GETPOST("idto", 'int');
+if (GETPOST("project", 'apha'))      $filters['project'] = GETPOST("project", 'apha');
+if (GETPOST("logina", 'apha'))       $filters['logina'] = GETPOST("logina", 'apha');
+if (GETPOST("logint", 'apha'))       $filters['logint'] = GETPOST("logint", 'apha');
+if (GETPOST("notolderthan", 'int'))  $filters['notolderthan'] = GETPOST("notolderthan", "int");
+else $filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
 
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
@@ -103,64 +103,64 @@ 
 
 
 // Define filename with prefix on filters predica (each predica set must have on cache file)
-$shortfilename='dolibarrcalendar';
-$filename=$shortfilename;
+$shortfilename = 'dolibarrcalendar';
+$filename = $shortfilename;
 // Complete long filename
 foreach ($filters as $key => $value)
 {
     //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
-	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
-	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
-	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
+	if ($key == 'year')            $filename .= '-year'.$value;
+    if ($key == 'id')              $filename .= '-id'.$value;
+    if ($key == 'idfrom')          $filename .= '-idfrom'.$value;
+    if ($key == 'idto')            $filename .= '-idto'.$value;
+    if ($key == 'project')         $filename .= '-project'.$value;
+	if ($key == 'logina')	       $filename .= '-logina'.$value; // Author
+	if ($key == 'logint')	       $filename .= '-logint'.$value; // Assigned to
 }
 // Add extension
-if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }
-if ($format == 'ical') { $shortfilename.='.ics'; $filename.='.ics'; }
-if ($format == 'rss')  { $shortfilename.='.rss'; $filename.='.rss'; }
+if ($format == 'vcal') { $shortfilename .= '.vcs'; $filename .= '.vcs'; }
+if ($format == 'ical') { $shortfilename .= '.ics'; $filename .= '.ics'; }
+if ($format == 'rss') { $shortfilename .= '.rss'; $filename .= '.rss'; }
 
-if ($shortfilename=='dolibarrcalendar')
+if ($shortfilename == 'dolibarrcalendar')
 {
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
+    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX", 'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
 
-$agenda=new ActionComm($db);
+$agenda = new ActionComm($db);
 
-$cachedelay=0;
-if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE;
+$cachedelay = 0;
+if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay = $conf->global->MAIN_AGENDA_EXPORT_CACHE;
 
 // Build file
 if ($format == 'ical' || $format == 'vcal')
 {
-	$result=$agenda->build_exportfile($format,$type,$cachedelay,$filename,$filters);
+	$result = $agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters);
 	if ($result >= 0)
 	{
 		$attachment = true;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
 		//$attachment = false;
-		$contenttype='text/calendar';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		$contenttype = 'text/calendar';
+		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
 		//$contenttype='text/plain';
-		$outputencoding='UTF-8';
+		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
 		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
 
 		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
 		else header('Cache-Control: private, must-revalidate');
 
 		// Clean parameters
-		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
-		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		$outputfile = $conf->agenda->dir_temp.'/'.$filename;
+		$result = readfile($outputfile);
+		if (!$result) print 'File '.$outputfile.' was empty.';
 
 	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
@@ -175,18 +175,18 @@ 
 
 if ($format == 'rss')
 {
-	$result=$agenda->build_exportfile($format,$type,$cachedelay,$filename,$filters);
+	$result = $agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters);
 	if ($result >= 0)
 	{
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
 		//$attachment = false;
-		$contenttype='application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		$contenttype = 'application/rss+xml';
+		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
 		//$contenttype='text/plain';
-		$outputencoding='UTF-8';
+		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
 		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
 
 		// Ajout directives pour resoudre bug IE
@@ -196,9 +196,9 @@ 
 		else header('Cache-Control: private, must-revalidate');
 
 		// Clean parameters
-		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
-		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		$outputfile = $conf->agenda->dir_temp.'/'.$filename;
+		$result = readfile($outputfile);
+		if (!$result) print 'File '.$outputfile.' was empty.';
 
 	//	header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;

Braces +121 added lines, -43 removed lines

@@ -32,10 +32,20 @@ 
 //if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 //if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
@@ -57,27 +67,53 @@ 
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 // Security check
-if (empty($conf->agenda->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->agenda->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 // Not older than
-if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;	// default limit
+if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) {
+	$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;
+}
+// default limit
 
 // Define format, type and filter
 $format='ical';
 $type='event';
-if (GETPOST("format",'alpha')) $format=GETPOST("format",'apha');
-if (GETPOST("type",'apha'))   $type=GETPOST("type",'alpha');
+if (GETPOST("format",'alpha')) {
+	$format=GETPOST("format",'apha');
+}
+if (GETPOST("type",'apha')) {
+	$type=GETPOST("type",'alpha');
+}
 
 $filters=array();
-if (GETPOST("year",'int')) 	        $filters['year']=GETPOST("year",'int');
-if (GETPOST("id",'int'))            $filters['id']=GETPOST("id",'int');
-if (GETPOST("idfrom",'int'))        $filters['idfrom']=GETPOST("idfrom",'int');
-if (GETPOST("idto",'int'))          $filters['idto']=GETPOST("idto",'int');
-if (GETPOST("project",'apha'))      $filters['project']=GETPOST("project",'apha');
-if (GETPOST("logina",'apha'))       $filters['logina']=GETPOST("logina",'apha');
-if (GETPOST("logint",'apha'))       $filters['logint']=GETPOST("logint",'apha');
-if (GETPOST("notolderthan",'int'))  $filters['notolderthan']=GETPOST("notolderthan","int");
-else $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+if (GETPOST("year",'int')) {
+	$filters['year']=GETPOST("year",'int');
+}
+if (GETPOST("id",'int')) {
+	$filters['id']=GETPOST("id",'int');
+}
+if (GETPOST("idfrom",'int')) {
+	$filters['idfrom']=GETPOST("idfrom",'int');
+}
+if (GETPOST("idto",'int')) {
+	$filters['idto']=GETPOST("idto",'int');
+}
+if (GETPOST("project",'apha')) {
+	$filters['project']=GETPOST("project",'apha');
+}
+if (GETPOST("logina",'apha')) {
+	$filters['logina']=GETPOST("logina",'apha');
+}
+if (GETPOST("logint",'apha')) {
+	$filters['logint']=GETPOST("logint",'apha');
+}
+if (GETPOST("notolderthan",'int')) {
+	$filters['notolderthan']=GETPOST("notolderthan","int");
+} else {
+	$filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+}
 
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
@@ -109,13 +145,29 @@ 
 foreach ($filters as $key => $value)
 {
     //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
-	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
-	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
-	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
+	if ($key == 'year') {
+		$filename.='-year'.$value;
+	}
+    if ($key == 'id') {
+    	$filename.='-id'.$value;
+    }
+    if ($key == 'idfrom') {
+    	$filename.='-idfrom'.$value;
+    }
+    if ($key == 'idto') {
+    	$filename.='-idto'.$value;
+    }
+    if ($key == 'project') {
+    	$filename.='-project'.$value;
+    }
+	if ($key == 'logina') {
+		$filename.='-logina'.$value;
+	}
+	// Author
+	if ($key == 'logint') {
+		$filename.='-logint'.$value;
+	}
+	// Assigned to
 }
 // Add extension
 if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }
@@ -135,7 +187,9 @@ 
 $agenda=new ActionComm($db);
 
 $cachedelay=0;
-if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE;
+if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) {
+	$cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE;
+}
 
 // Build file
 if ($format == 'ical' || $format == 'vcal')
@@ -144,28 +198,40 @@ 
 	if ($result >= 0)
 	{
 		$attachment = true;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment=$_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype='text/calendar';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype=$_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding='UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
+		}
 
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
 		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		if (! $result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
+	} else
 	{
 		print 'Error '.$agenda->error;
 
@@ -179,31 +245,43 @@ 
 	if ($result >= 0)
 	{
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment=$_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype='application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype=$_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding='UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
+		}
 
 		// Ajout directives pour resoudre bug IE
 		//header('Cache-Control: Public, must-revalidate');
 		//header('Pragma: public');
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
 		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		if (! $result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 	//	header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
+	} else
 	{
 		print 'Error '.$agenda->error;
 

htdocs/public/onlinesign/newonlinesign.php

Braces +84 added lines, -49 removed lines

@@ -33,7 +33,9 @@ 
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -133,7 +135,9 @@ 
  */
 
 $head='';
-if (! empty($conf->global->MAIN_SIGN_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+if (! empty($conf->global->MAIN_SIGN_CSS_URL)) {
+	$head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
 
 $conf->dol_hide_topmenu=1;
 $conf->dol_hide_leftmenu=1;
@@ -170,16 +174,18 @@ 
 $logosmall=$mysoc->logo_small;
 $logo=$mysoc->logo;
 $paramlogo='ONLINE_SIGN_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall=$conf->global->ONLINE_SIGN_LOGO;
+if (! empty($conf->global->$paramlogo)) {
+	$logosmall=$conf->global->$paramlogo;
+} else if (! empty($conf->global->ONLINE_SIGN_LOGO)) {
+	$logosmall=$conf->global->ONLINE_SIGN_LOGO;
+}
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
 	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
-}
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
 	$width=96;
@@ -189,7 +195,9 @@ 
 {
 	print '<tr>';
 	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
+	if ($width) {
+		print ' width="'.$width.'"';
+	}
 	print '></td>';
 	print '</tr>'."\n";
 }
@@ -199,8 +207,11 @@ 
 if (! empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) {
+    	$text.=$langs->trans($reg[1])."<br>\n";
+    } else {
+    	$text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    }
     $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
@@ -254,8 +265,7 @@ 
 	{
 		$mesg=$order->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$result=$order->fetch_thirdparty($order->socid);
 	}
@@ -299,16 +309,19 @@ 
 	{
 		$mesg=$invoice->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    if ($action != 'dosign') {
+    	// Do not change amount if we just click on first dosign
     {
     	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    }
+        if (GETPOST("amount",'int')) {
+        	$amount=GETPOST("amount",'int');
+        }
         $amount=price2num($amount);
     }
 
@@ -349,8 +362,7 @@ 
 	{
 		$mesg=$contractline->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		if ($contractline->fk_contrat > 0)
 		{
@@ -359,23 +371,23 @@ 
 			if ($result > 0)
 			{
 				$result=$contract->fetch_thirdparty($contract->socid);
-			}
-			else
+			} else
 			{
 				$mesg=$contract->error;
 				$error++;
 			}
-		}
-		else
+		} else
 		{
 			$mesg='ErrorRecordNotFound';
 			$error++;
 		}
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    if ($action != 'dosign') {
+    	// Do not change amount if we just click on first dosign
     {
     	$amount=$contractline->total_ttc;
+    }
     	if ($contractline->fk_product)
     	{
     		$product=new Product($db);
@@ -387,8 +399,7 @@ 
     			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
     			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
     			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-    		}
-    		else
+    		} else
     		{
     			$pu_ht = $product->price;
     			$pu_ttc = $product->price_ttc;
@@ -402,12 +413,16 @@ 
     			exit;
     		}
     	}
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        if (GETPOST("amount",'int')) {
+        	$amount=GETPOST("amount",'int');
+        }
         $amount=price2num($amount);
     }
 
 	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
+	if (GETPOST('qty')) {
+		$qty=GETPOST('qty');
+	}
 
 	// Creditor
 
@@ -428,7 +443,9 @@ 
 	{
 		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
 	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	if ($contractline->description) {
+		$text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	}
 	//if ($contractline->date_fin_validite) {
 	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
 	//	$text.=dol_print_date($contractline->date_fin_validite);
@@ -459,8 +476,7 @@ 
 			if ($product->duration_value > 1)
 			{
 				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
-			}
-			else
+			} else
 			{
 				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
 			}
@@ -475,14 +491,15 @@ 
 	// Amount
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount)) {
+		print ' ('.$langs->trans("ToComplete").')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
         print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -509,16 +526,19 @@ 
 	{
 		$mesg=$member->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$subscription=new Subscription($db);
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    if ($action != 'dosign') {
+    	// Do not change amount if we just click on first dosign
     {
     	$amount=$subscription->total_ttc;
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    }
+        if (GETPOST("amount",'int')) {
+        	$amount=GETPOST("amount",'int');
+        }
         $amount=price2num($amount);
     }
 
@@ -537,8 +557,11 @@ 
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
-	else print $member->getFullName($langs);
+	if ($member->morphy == 'mor' && ! empty($member->societe)) {
+		print $member->societe;
+	} else {
+		print $member->getFullName($langs);
+	}
 	print '</b>';
 
 	// Object
@@ -564,7 +587,9 @@ 
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
-		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+		if (empty($amount) && ! GETPOST('newamount')) {
+			$_GET['newamount']=$member->last_subscription_amount;
+		}
 	}
 
 	// Amount
@@ -573,20 +598,25 @@ 
 	if (empty($amount))
 	{
 		print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
+			print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		}
 		print ')';
 	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
 	    $valtoshow=GETPOST("newamount",'int');
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
+	    	$valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    }
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 	    $valtoshow=$amount;
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
+	    	$valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    }
 	    print '<b>'.price($valtoshow).'</b>';
         print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
@@ -601,16 +631,21 @@ 
 
 
 
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+if (! $found && ! $mesg) {
+	$mesg=$langs->trans("ErrorBadParameters");
+}
 
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+if ($mesg) {
+	print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+}
 
 print '</table>'."\n";
 print "\n";
 
 if ($action != 'dosign')
 {
-    if ($found && ! $error)	// We are in a management option and no error
+    if ($found && ! $error) {
+    	// We are in a management option and no error
     {
 
 
@@ -619,8 +654,8 @@ 
     {
     	dol_print_error_email('ERRORNEWONLINESIGNPAYPAL');
     }
-}
-else
+    }
+} else
 {
     // Print
 }

Indentation +101 added lines, -101 removed lines

@@ -67,11 +67,11 @@ 
 
 if (! $action)
 {
-    if ($source && ! $ref)
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
-    	exit;
-    }
+	if ($source && ! $ref)
+	{
+		dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+		exit;
+	}
 }
 
 
@@ -92,18 +92,18 @@ 
 
 if (! empty($SOURCE))
 {
-    $urlok.='source='.urlencode($SOURCE).'&';
-    $urlko.='source='.urlencode($SOURCE).'&';
+	$urlok.='source='.urlencode($SOURCE).'&';
+	$urlko.='source='.urlencode($SOURCE).'&';
 }
 if (! empty($REF))
 {
-    $urlok.='ref='.urlencode($REF).'&';
-    $urlko.='ref='.urlencode($REF).'&';
+	$urlok.='ref='.urlencode($REF).'&';
+	$urlko.='ref='.urlencode($REF).'&';
 }
 if (! empty($SECUREKEY))
 {
-    $urlok.='securekey='.urlencode($SECUREKEY).'&';
-    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+	$urlok.='securekey='.urlencode($SECUREKEY).'&';
+	$urlko.='securekey='.urlencode($SECUREKEY).'&';
 }
 if (! empty($entity))
 {
@@ -123,7 +123,7 @@ 
 
 if ($action == 'dosign')
 {
-    // TODO
+	// TODO
 
 }
 
@@ -143,11 +143,11 @@ 
 // Check link validity
 if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
 {
-    $langs->load("errors");
-    dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
-    llxFooter();
-    $db->close();
-    exit;
+	$langs->load("errors");
+	dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+	llxFooter();
+	$db->close();
+	exit;
 }
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -198,15 +198,15 @@ 
 $text='';
 if (! empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
 {
-    $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+	$langs->load("members");
+	if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+	else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+	$text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
-    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage").'</strong></td></tr>'."\n";
-    $text.='<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom",$creditor).'<br><br></td></tr>'."\n";
+	$text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage").'</strong></td></tr>'."\n";
+	$text.='<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom",$creditor).'<br><br></td></tr>'."\n";
 }
 print $text;
 
@@ -229,14 +229,14 @@ 
 	// Creditor
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 
 
-    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
-    // as they don't exists (buyer is unknown, tag is free).
+	// We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+	// as they don't exists (buyer is unknown, tag is free).
 }
 
 
@@ -263,9 +263,9 @@ 
 	// Creditor
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Debitor
 
@@ -305,19 +305,19 @@ 
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
-    {
-    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-        $amount=price2num($amount);
-    }
+	if ($action != 'dosign') // Do not change amount if we just click on first dosign
+	{
+		$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+		$amount=price2num($amount);
+	}
 
 	// Creditor
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Debitor
 
@@ -373,38 +373,38 @@ 
 		}
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
-    {
-    	$amount=$contractline->total_ttc;
-    	if ($contractline->fk_product)
-    	{
-    		$product=new Product($db);
-    		$result=$product->fetch($contractline->fk_product);
-
-    		// We define price for product (TODO Put this in a method in product class)
-    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-    		{
-    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-    		}
-    		else
-    		{
-    			$pu_ht = $product->price;
-    			$pu_ttc = $product->price_ttc;
-    			$price_base_type = $product->price_base_type;
-    		}
-
-    		$amount=$pu_ttc;
-    		if (empty($amount))
-    		{
-    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-    			exit;
-    		}
-    	}
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-        $amount=price2num($amount);
-    }
+	if ($action != 'dosign') // Do not change amount if we just click on first dosign
+	{
+		$amount=$contractline->total_ttc;
+		if ($contractline->fk_product)
+		{
+			$product=new Product($db);
+			$result=$product->fetch($contractline->fk_product);
+
+			// We define price for product (TODO Put this in a method in product class)
+			if (! empty($conf->global->PRODUIT_MULTIPRICES))
+			{
+				$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+				$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+			}
+			else
+			{
+				$pu_ht = $product->price;
+				$pu_ttc = $product->price_ttc;
+				$price_base_type = $product->price_base_type;
+			}
+
+			$amount=$pu_ttc;
+			if (empty($amount))
+			{
+				dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+				exit;
+			}
+		}
+		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+		$amount=price2num($amount);
+	}
 
 	$qty=1;
 	if (GETPOST('qty')) $qty=GETPOST('qty');
@@ -413,7 +413,7 @@ 
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
@@ -479,12 +479,12 @@ 
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+		print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
 	// Currency
@@ -515,12 +515,12 @@ 
 		$subscription=new Subscription($db);
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
-    {
-    	$amount=$subscription->total_ttc;
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-        $amount=price2num($amount);
-    }
+	if ($action != 'dosign') // Do not change amount if we just click on first dosign
+	{
+		$amount=$subscription->total_ttc;
+		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+		$amount=price2num($amount);
+	}
 
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -529,9 +529,9 @@ 
 	// Creditor
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Debitor
 
@@ -579,16 +579,16 @@ 
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
-	    $valtoshow=GETPOST("newamount",'int');
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+		$valtoshow=GETPOST("newamount",'int');
+		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+		print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
 	}
 	else {
-	    $valtoshow=$amount;
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-	    print '<b>'.price($valtoshow).'</b>';
-        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		$valtoshow=$amount;
+		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		print '<b>'.price($valtoshow).'</b>';
+		print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
 	}
 	// Currency
@@ -610,19 +610,19 @@ 
 
 if ($action != 'dosign')
 {
-    if ($found && ! $error)	// We are in a management option and no error
-    {
+	if ($found && ! $error)	// We are in a management option and no error
+	{
 
 
-    }
-    else
-    {
-    	dol_print_error_email('ERRORNEWONLINESIGNPAYPAL');
-    }
+	}
+	else
+	{
+		dol_print_error_email('ERRORNEWONLINESIGNPAYPAL');
+	}
 }
 else
 {
-    // Print
+	// Print
 }
 
 print '</td></tr>'."\n";

Spacing +174 added lines, -174 removed lines

@@ -26,13 +26,13 @@ 
  *		\brief      File to offer a way to make an online signature for a particular Dolibarr entity
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
@@ -50,9 +50,9 @@ 
 $langs->load("bills");
 $langs->load("companies");
 $langs->load("errors");
-$langs->load("paybox");     // File with generic data
+$langs->load("paybox"); // File with generic data
 
-$action=GETPOST('action','alpha');
+$action = GETPOST('action', 'alpha');
 
 // Input are:
 // type ('invoice','order','contractline'),
@@ -61,22 +61,22 @@ 
 // tag (a free text, required if type is empty)
 // currency (iso code)
 
-$suffix=GETPOST("suffix",'alpha');
-$SOURCE=GETPOST("source",'alpha');
-$ref=$REF=GETPOST("ref",'alpha');
+$suffix = GETPOST("suffix", 'alpha');
+$SOURCE = GETPOST("source", 'alpha');
+$ref = $REF = GETPOST("ref", 'alpha');
 
-if (! $action)
+if (!$action)
 {
-    if ($source && ! $ref)
+    if ($source && !$ref)
     {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	dol_print_error('', $langs->trans('ErrorBadParameters')." - ref");
     	exit;
     }
 }
 
 
-$paymentmethod='';
-$validpaymentmethod=array();
+$paymentmethod = '';
+$validpaymentmethod = array();
 
 
 
@@ -84,34 +84,34 @@ 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
 
 // Complete urls for post treatment
-$SECUREKEY=GETPOST("securekey");	        // Secure key
+$SECUREKEY = GETPOST("securekey"); // Secure key
 
-if (! empty($SOURCE))
+if (!empty($SOURCE))
 {
-    $urlok.='source='.urlencode($SOURCE).'&';
-    $urlko.='source='.urlencode($SOURCE).'&';
+    $urlok .= 'source='.urlencode($SOURCE).'&';
+    $urlko .= 'source='.urlencode($SOURCE).'&';
 }
-if (! empty($REF))
+if (!empty($REF))
 {
-    $urlok.='ref='.urlencode($REF).'&';
-    $urlko.='ref='.urlencode($REF).'&';
+    $urlok .= 'ref='.urlencode($REF).'&';
+    $urlko .= 'ref='.urlencode($REF).'&';
 }
-if (! empty($SECUREKEY))
+if (!empty($SECUREKEY))
 {
-    $urlok.='securekey='.urlencode($SECUREKEY).'&';
-    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+    $urlok .= 'securekey='.urlencode($SECUREKEY).'&';
+    $urlko .= 'securekey='.urlencode($SECUREKEY).'&';
 }
-if (! empty($entity))
+if (!empty($entity))
 {
-	$urlok.='entity='.urlencode($entity).'&';
-	$urlko.='entity='.urlencode($entity).'&';
+	$urlok .= 'entity='.urlencode($entity).'&';
+	$urlko .= 'entity='.urlencode($entity).'&';
 }
-$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
-$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+$urlok = preg_replace('/&$/', '', $urlok); // Remove last &
+$urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
 
 
@@ -132,16 +132,16 @@ 
  * View
  */
 
-$head='';
-if (! empty($conf->global->MAIN_SIGN_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+$head = '';
+if (!empty($conf->global->MAIN_SIGN_CSS_URL)) $head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
 
 llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 // Check link validity
-if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+if (!empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
 {
     $langs->load("errors");
     dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
@@ -155,8 +155,8 @@ 
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 print '<input type="hidden" name="action" value="dosign">'."\n";
-print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
-print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix", 'alpha').'">'."\n";
 print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print "\n";
@@ -165,24 +165,24 @@ 
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
 // Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
-$width=0;
+$width = 0;
 // Define logo and logosmall
-$logosmall=$mysoc->logo_small;
-$logo=$mysoc->logo;
-$paramlogo='ONLINE_SIGN_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall=$conf->global->ONLINE_SIGN_LOGO;
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_SIGN_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) $logosmall = $conf->global->$paramlogo;
+else if (!empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall = $conf->global->ONLINE_SIGN_LOGO;
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
-$urllogo='';
-if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+$urllogo = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
 }
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
-	$width=96;
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+	$width = 96;
 }
 // Output html code for logo
 if ($urllogo)
@@ -195,18 +195,18 @@ 
 }
 
 // Output introduction text
-$text='';
-if (! empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
+$text = '';
+if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+    if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
+    else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    $text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
-    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage").'</strong></td></tr>'."\n";
-    $text.='<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom",$creditor).'<br><br></td></tr>'."\n";
+    $text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage").'</strong></td></tr>'."\n";
+    $text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
 }
 print $text;
 
@@ -215,21 +215,21 @@ 
 print '<table with="100%" id="tablepublicpayment">';
 print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnDocumentToSign").' :</td></tr>'."\n";
 
-$found=false;
-$error=0;
-$var=false;
+$found = false;
+$error = 0;
+$var = false;
 
 // Free payment
-if (! GETPOST("source"))
+if (!GETPOST("source"))
 {
-	$found=true;
-	$tag=GETPOST("tag");
-	$fulltag=$tag;
+	$found = true;
+	$tag = GETPOST("tag");
+	$fulltag = $tag;
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
@@ -243,41 +243,41 @@ 
 // Payment on customer order
 if (GETPOST("source") == 'order')
 {
-	$found=true;
+	$found = true;
 	$langs->load("orders");
 
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-	$order=new Commande($db);
-	$result=$order->fetch('',$ref);
+	$order = new Commande($db);
+	$result = $order->fetch('', $ref);
 	if ($result < 0)
 	{
-		$mesg=$order->error;
+		$mesg = $order->error;
 		$error++;
 	}
 	else
 	{
-		$result=$order->fetch_thirdparty($order->socid);
+		$result = $order->fetch_thirdparty($order->socid);
 	}
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
 
-	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	$text = '<b>'.$langs->trans("PaymentOrderRef", $order->ref).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
 	print '</td></tr>'."\n";
 
@@ -288,48 +288,48 @@ 
 // Payment on customer invoice
 if (GETPOST("source") == 'invoice')
 {
-	$found=true;
+	$found = true;
 	$langs->load("bills");
 
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-	$invoice=new Facture($db);
-	$result=$invoice->fetch('',$ref);
+	$invoice = new Facture($db);
+	$result = $invoice->fetch('', $ref);
 	if ($result < 0)
 	{
-		$mesg=$invoice->error;
+		$mesg = $invoice->error;
 		$error++;
 	}
 	else
 	{
-		$result=$invoice->fetch_thirdparty($invoice->socid);
+		$result = $invoice->fetch_thirdparty($invoice->socid);
 	}
 
     if ($action != 'dosign') // Do not change amount if we just click on first dosign
     {
-    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-        $amount=price2num($amount);
+    	$amount = price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+        $amount = price2num($amount);
     }
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
 
-	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	$text = '<b>'.$langs->trans("PaymentInvoiceRef", $invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
 	print '</td></tr>'."\n";
 
@@ -338,51 +338,51 @@ 
 // Payment on contract line
 if (GETPOST("source") == 'contractline')
 {
-	$found=true;
+	$found = true;
 	$langs->load("contracts");
 
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-	$contractline=new ContratLigne($db);
-	$result=$contractline->fetch('',$ref);
+	$contractline = new ContratLigne($db);
+	$result = $contractline->fetch('', $ref);
 	if ($result < 0)
 	{
-		$mesg=$contractline->error;
+		$mesg = $contractline->error;
 		$error++;
 	}
 	else
 	{
 		if ($contractline->fk_contrat > 0)
 		{
-			$contract=new Contrat($db);
-			$result=$contract->fetch($contractline->fk_contrat);
+			$contract = new Contrat($db);
+			$result = $contract->fetch($contractline->fk_contrat);
 			if ($result > 0)
 			{
-				$result=$contract->fetch_thirdparty($contract->socid);
+				$result = $contract->fetch_thirdparty($contract->socid);
 			}
 			else
 			{
-				$mesg=$contract->error;
+				$mesg = $contract->error;
 				$error++;
 			}
 		}
 		else
 		{
-			$mesg='ErrorRecordNotFound';
+			$mesg = 'ErrorRecordNotFound';
 			$error++;
 		}
 	}
 
     if ($action != 'dosign') // Do not change amount if we just click on first dosign
     {
-    	$amount=$contractline->total_ttc;
+    	$amount = $contractline->total_ttc;
     	if ($contractline->fk_product)
     	{
-    		$product=new Product($db);
-    		$result=$product->fetch($contractline->fk_product);
+    		$product = new Product($db);
+    		$result = $product->fetch($contractline->fk_product);
 
     		// We define price for product (TODO Put this in a method in product class)
-    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		if (!empty($conf->global->PRODUIT_MULTIPRICES))
     		{
     			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
     			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
@@ -395,92 +395,92 @@ 
     			$price_base_type = $product->price_base_type;
     		}
 
-    		$amount=$pu_ttc;
+    		$amount = $pu_ttc;
     		if (empty($amount))
     		{
-    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			dol_print_error('', 'ErrorNoPriceDefinedForThisProduct');
     			exit;
     		}
     	}
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-        $amount=price2num($amount);
+        if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+        $amount = price2num($amount);
     }
 
-	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
+	$qty = 1;
+	if (GETPOST('qty')) $qty = GETPOST('qty');
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
 
-	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	$text = '<b>'.$langs->trans("PaymentRenewContractId", $contract->ref, $contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
-		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+		$text .= '<br>'.$product->ref.($product->label ? ' - '.$product->label : '');
 	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	if ($contractline->description) $text .= '<br>'.dol_htmlentitiesbr($contractline->description);
 	//if ($contractline->date_fin_validite) {
 	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
 	//	$text.=dol_print_date($contractline->date_fin_validite);
 	//}
 	if ($contractline->date_fin_validite)
 	{
-		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+		$text .= '<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
 	}
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
 	print '</td></tr>'."\n";
 
 	// Quantity
 
-	$label=$langs->trans("Quantity");
-	$qty=1;
-	$duration='';
+	$label = $langs->trans("Quantity");
+	$qty = 1;
+	$duration = '';
 	if ($contractline->fk_product)
 	{
 		if ($product->isService() && $product->duration_value > 0)
 		{
-			$label=$langs->trans("Duration");
+			$label = $langs->trans("Duration");
 
 			// TODO Put this in a global method
 			if ($product->duration_value > 1)
 			{
-				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
 			}
 			else
 			{
-				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
 			}
-			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+			$duration = $product->duration_value.' '.$dur[$product->duration_unit];
 		}
 	}
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
-	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var ? '1' : '2').'"><b>'.($duration ? $duration : $qty).'</b>';
 	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
 	print '</b></td></tr>'."\n";
 
 	// Amount
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	if (empty($amount) || !is_numeric($amount))
 	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount", "int").'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -497,56 +497,56 @@ 
 // Payment on member subscription
 if (GETPOST("source") == 'membersubscription')
 {
-	$found=true;
+	$found = true;
 	$langs->load("members");
 
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-	$member=new Adherent($db);
-	$result=$member->fetch('',$ref);
+	$member = new Adherent($db);
+	$result = $member->fetch('', $ref);
 	if ($result < 0)
 	{
-		$mesg=$member->error;
+		$mesg = $member->error;
 		$error++;
 	}
 	else
 	{
-		$subscription=new Subscription($db);
+		$subscription = new Subscription($db);
 	}
 
     if ($action != 'dosign') // Do not change amount if we just click on first dosign
     {
-    	$amount=$subscription->total_ttc;
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-        $amount=price2num($amount);
+    	$amount = $subscription->total_ttc;
+        if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+        $amount = price2num($amount);
     }
 
-	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
+	$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M');
+	if (!empty($TAG)) { $tag = $TAG; $fulltag .= '.TAG='.$TAG; }
+	$fulltag = dol_string_unaccent($fulltag);
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	if ($member->morphy == 'mor' && !empty($member->societe)) print $member->societe;
 	else print $member->getFullName($langs);
 	print '</b>';
 
 	// Object
 
-	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	$text = '<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
 	print '</td></tr>'."\n";
 
@@ -554,39 +554,39 @@ 
 	{
 		// Last subscription date
 
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->last_subscription_date, 'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
 
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
-		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+		if (empty($amount) && !GETPOST('newamount')) $_GET['newamount'] = $member->last_subscription_amount;
 	}
 
 	// Amount
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
 		print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		if (!empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
 		print ')';
 	}
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	if (empty($amount) || !is_numeric($amount))
 	{
-	    $valtoshow=GETPOST("newamount",'int');
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    $valtoshow = GETPOST("newamount", 'int');
+	    if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
 	}
 	else {
-	    $valtoshow=$amount;
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    $valtoshow = $amount;
+	    if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 	    print '<b>'.price($valtoshow).'</b>';
         print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
@@ -601,7 +601,7 @@ 
 
 
 
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+if (!$found && !$mesg) $mesg = $langs->trans("ErrorBadParameters");
 
 if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
 
@@ -610,7 +610,7 @@ 
 
 if ($action != 'dosign')
 {
-    if ($found && ! $error)	// We are in a management option and no error
+    if ($found && !$error)	// We are in a management option and no error
     {
 
 
@@ -633,7 +633,7 @@ 
 print '<br>';
 
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc, $langs);
 
 llxFooter('', 'public');
 

htdocs/public/members/public_card.php

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
 	print "</body>\n";
 	print "</html>\n";

Spacing +14 added lines, -14 removed lines

@@ -24,13 +24,13 @@ 
  * 	\brief      File to show a public card of a member
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
@@ -39,7 +39,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->adherent->enabled)) accessforbidden('', 0, 0, 1);
 
 
 $langs->load("main");
@@ -47,7 +47,7 @@ 
 $langs->load("companies");
 $langs->load("other");
 
-$id=GETPOST('id','int');
+$id = GETPOST('id', 'int');
 $object = new Adherent($db);
 $extrafields = new ExtraFields($db);
 
@@ -65,19 +65,19 @@ 
  * View
  */
 
-$morehead='';
-if (! empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+$morehead = '';
+if (!empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
+else $morehead = '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
 
 llxHeaderVierge($langs->trans("MemberCard"), $morehead);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label('adherent');
+$extralabels = $extrafields->fetch_name_optionals_label('adherent');
 if ($id > 0)
 {
-	$res=$object->fetch($id);
-	if ($res < 0) { dol_print_error($db,$object->error); exit; }
-	$res=$object->fetch_optionals($object->id,$extralabels);
+	$res = $object->fetch($id);
+	if ($res < 0) { dol_print_error($db, $object->error); exit; }
+	$res = $object->fetch_optionals($object->id, $extralabels);
 
 	print load_fiche_titre($langs->trans("MemberCard"), '', '');
 
@@ -98,9 +98,9 @@ 
 		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.' '.$object->town.'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">'.$object->country.'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.$object->email.'&nbsp;</td></tr>';
-		print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
+		print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
 
-		if (isset($object->photo) && $object->photo !='')
+		if (isset($object->photo) && $object->photo != '')
 		{
 			$form = new Form($db);
 			print '<tr><td>URL Photo</td><td class="valeur">';

Braces +15 added lines, -7 removed lines

@@ -31,7 +31,9 @@ 
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -39,7 +41,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->adherent->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 
 $langs->load("main");
@@ -66,8 +70,11 @@ 
  */
 
 $morehead='';
-if (! empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+if (! empty($conf->global->MEMBER_PUBLIC_CSS)) {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
+} else {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+}
 
 llxHeaderVierge($langs->trans("MemberCard"), $morehead);
 
@@ -84,8 +91,7 @@ 
 	if (empty($object->public))
 	{
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
-	}
-	else
+	} else
 	{
 		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
 
@@ -140,7 +146,9 @@ 
 	print "<html>\n";
 	print "<head>\n";
 	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
+	if ($head) {
+		print $head."\n";
+	}
 	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }

htdocs/public/members/public_list.php

Indentation +6 added lines, -6 removed lines

@@ -58,10 +58,10 @@ 
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 	print "<html>\n";
-    print "<head>\n";
-    print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
-    print "</head>\n";
+	print "<head>\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
@@ -72,9 +72,9 @@ 
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
+	print "</body>\n";
 	print "</html>\n";
 }
 

Braces +16 added lines, -9 removed lines

@@ -31,12 +31,16 @@ 
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 require '../../main.inc.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->adherent->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 
 $langs->load("main");
@@ -60,7 +64,9 @@ 
 	print "<html>\n";
     print "<head>\n";
     print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
+    if ($head) {
+    	print $head."\n";
+    }
     print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
@@ -102,8 +108,11 @@ 
 $form = new Form($db);
 
 $morehead='';
-if (! empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+if (! empty($conf->global->MEMBER_PUBLIC_CSS)) {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
+} else {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+}
 
 llxHeaderVierge($langs->trans("ListOfValidatedPublicMembers"), $morehead);
 
@@ -155,8 +164,7 @@ 
 			print '<td>';
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
-		}
-		else
+		} else
 		{
 			print "<td>&nbsp;</td>\n";
 		}
@@ -164,8 +172,7 @@ 
 		$i++;
 	}
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +28 added lines, -28 removed lines

@@ -24,19 +24,19 @@ 
  *  \brief      File sample to list members
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->adherent->enabled)) accessforbidden('', 0, 0, 1);
 
 
 $langs->load("main");
@@ -79,20 +79,20 @@ 
 }
 
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$limit = GETPOST('limit') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$filter=GETPOST('filter');
-$statut=GETPOST('statut');
+$filter = GETPOST('filter');
+$statut = GETPOST('statut');
 
-if (! $sortorder) {  $sortorder="ASC"; }
-if (! $sortfield) {  $sortfield="lastname"; }
+if (!$sortorder) {  $sortorder = "ASC"; }
+if (!$sortfield) {  $sortfield = "lastname"; }
 
 
 /*
@@ -101,19 +101,19 @@ 
 
 $form = new Form($db);
 
-$morehead='';
-if (! empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+$morehead = '';
+if (!empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
+else $morehead = '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
 
 llxHeaderVierge($langs->trans("ListOfValidatedPublicMembers"), $morehead);
 
 $sql = "SELECT rowid, firstname, lastname, societe, zip, town, email, birth, photo";
-$sql.= " FROM ".MAIN_DB_PREFIX."adherent";
-$sql.= " WHERE entity = ".$entity;
-$sql.= " AND statut = 1";
-$sql.= " AND public = 1";
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent";
+$sql .= " WHERE entity = ".$entity;
+$sql .= " AND statut = 1";
+$sql .= " AND public = 1";
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($conf->liste_limit + 1, $offset);
 //$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, zip, town, d.email, t.libelle as type, d.morphy, d.statut, t.subscription";
 //$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
 //$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = $statut";
@@ -125,21 +125,21 @@ 
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	$param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield";
+	$param = "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield";
 	print_barre_liste($langs->trans("ListOfValidatedPublicMembers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, 0, '');
 	print '<table class="public_border" width="100%">';
 
 	print '<tr class="public_liste_titre">';
-	print '<td><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=firstname">'.dolGetFirstLastname($langs->trans("Firstname"),$langs->trans("Lastname")).'</a></td>';
+	print '<td><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=firstname">'.dolGetFirstLastname($langs->trans("Firstname"), $langs->trans("Lastname")).'</a></td>';
 	print '<td><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=societe">'.$langs->trans("Company").'</a></td>'."\n";
 	//print_liste_field_titre("DateToBirth", $_SERVER["PHP_SELF"],"birth",'',$param,$sortfield,$sortorder); // est-ce nécessaire ??
-	print_liste_field_titre("EMail", $_SERVER["PHP_SELF"],"email",'',$param,'',$sortfield,$sortorder,'public_');
-	print_liste_field_titre("Zip", $_SERVER["PHP_SELF"],"zip","",$param,'',$sortfield,$sortorder,'public_');
-	print_liste_field_titre("Town", $_SERVER["PHP_SELF"],"town","",$param,'',$sortfield,$sortorder,'public_');
-	print_liste_field_titre("Photo", $_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder,'public_');
+	print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "email", '', $param, '', $sortfield, $sortorder, 'public_');
+	print_liste_field_titre("Zip", $_SERVER["PHP_SELF"], "zip", "", $param, '', $sortfield, $sortorder, 'public_');
+	print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "town", "", $param, '', $sortfield, $sortorder, 'public_');
+	print_liste_field_titre("Photo", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'public_');
 	print "</tr>\n";
 
-	$var=True;
+	$var = True;
 	while ($i < $num && $i < $conf->liste_limit)
 	{
 		$objp = $db->fetch_object($result);

htdocs/public/emailing/mailing-read.php

Indentation +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
 	$resql=$db->query($sql);
 
-    //Update status communication of contact prospect
+	//Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 

Spacing +12 added lines, -12 removed lines

@@ -25,11 +25,11 @@ 
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
 
 /**
  * Header empty
@@ -47,8 +47,8 @@ 
 
 require '../../main.inc.php';
 
-$tag=GETPOST('tag');
-$securitykey=GETPOST('securitykey');
+$tag = GETPOST('tag');
+$securitykey = GETPOST('securitykey');
 
 
 /*
@@ -63,25 +63,25 @@ 
 	exit;
 }
 
-if (! empty($tag))
+if (!empty($tag))
 {
-	$statut='2';
+	$statut = '2';
 	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'";
 	dol_syslog("public/emailing/mailing-read.php : Mail read : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 
 	//Update status communication of thirdparty prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read thirdparty : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 
     //Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 
 }
 

Braces +19 added lines, -5 removed lines

@@ -25,11 +25,25 @@
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (! defined('NOLOGIN')) {
+	define("NOLOGIN",1);
+}
+// This means this output page does not require to be logged.
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK','1');
+}
+// Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+// If there is no need to load and show top and left menu
 
 /**
  * Header empty