Dolibarr / dolibarr

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

Spacing +1211 added lines, -1211 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';
-	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	public $picto='bill';
+	public $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,11 +77,11 @@ 
 	//var $amount;
 	public $remise_absolue;
 	public $remise_percent;
-	public $total_ht=0;
-	public $total_tva=0;
-	public $total_localtax1=0;
-	public $total_localtax2=0;
-	public $total_ttc=0;
+	public $total_ht = 0;
+	public $total_tva = 0;
+	public $total_localtax1 = 0;
+	public $total_localtax2 = 0;
+	public $total_ttc = 0;
 	public $revenuestamp;
 
 	//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
@@ -93,21 +93,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;
@@ -138,12 +138,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;
 
@@ -230,24 +230,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 should 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))
 		{
@@ -261,20 +261,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();
 
@@ -285,18 +285,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;
@@ -309,20 +309,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;
@@ -334,26 +334,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=getCommonSubstitutionArray($outputlangs, 0, null, $this);
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $this);
 			$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m');
 			$substitutionarray['__INVOICE_MONTH__'] = dol_print_date($this->date, '%m');
 			$substitutionarray['__INVOICE_NEXT_MONTH__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m');
@@ -369,105 +369,105 @@ 
 
 			//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++;
 
-			if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
 			{
-				$this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+				$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 			}
 
 			// 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)
 				            {
-				                $this->error=$this->db->lasterror();
+				                $this->error = $this->db->lasterror();
 				                $error++;
 				            }
 				        }
@@ -476,22 +476,22 @@ 
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
-    					if (! $ret)
+    					if (!$ret)
     					{
-    						$this->error=$this->db->lasterror();
+    						$this->error = $this->db->lasterror();
     						$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
+			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();
@@ -508,15 +508,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);
@@ -532,8 +532,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;
@@ -546,8 +546,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) {
@@ -556,7 +556,7 @@ 
 					}
 					if ($result < 0)
 					{
-						$this->error=$newinvoiceline->error;
+						$this->error = $newinvoiceline->error;
 						$error++;
 						break;
 					}
@@ -574,7 +574,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)
 					{
@@ -585,7 +585,7 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
-						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
+						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
 
 						$result = $this->addline(
 							$line->desc,
@@ -620,7 +620,7 @@ 
 						);
 						if ($result < 0)
 						{
-							$this->error=$this->db->lasterror();
+							$this->error = $this->db->lasterror();
 							dol_print_error($this->db);
 							$this->db->rollback();
 							return -1;
@@ -637,20 +637,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,
@@ -661,7 +661,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,
@@ -671,29 +671,29 @@ 
 						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,
 						$_facrec->lines[$i]->pu_ht_devise
 					);
 
-					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 !!
@@ -705,9 +705,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++;
 					}
 						/*}
@@ -715,11 +715,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;
@@ -732,7 +732,7 @@ 
 				}
 				else
 				{
-					$this->error=$langs->trans('FailedToUpdatePrice');
+					$this->error = $langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
@@ -746,7 +746,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -760,20 +760,20 @@ 
 	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function createFromCurrent(User $user, $invertdetail=0)
+	function createFromCurrent(User $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;
@@ -794,14 +794,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)
@@ -820,8 +820,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))
 		{
@@ -848,18 +848,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
@@ -868,27 +868,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;
@@ -897,20 +897,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
@@ -925,19 +925,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
 		}
@@ -945,7 +945,7 @@ 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $this->id;
@@ -968,18 +968,18 @@ 
 	{
 		global $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;
@@ -988,30 +988,30 @@ 
 			$line->total_localtax1	= $object->lines[$i]->total_localtax1;
 			$line->total_localtax2	= $object->lines[$i]->total_localtax2;
 			$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->date_start 		= $object->lines[$i]->date_start;
-			$line->date_end 		= $object->lines[$i]->date_end;
+			$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;
+			$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;
@@ -1030,17 +1030,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);
 		}
@@ -1052,12 +1052,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;
 			}
@@ -1072,21 +1072,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>';
 	}
 
@@ -1103,13 +1103,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;
@@ -1119,72 +1119,72 @@ 
 		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_tva))
-                $label.= '<br><b>' . $langs->trans('LT1') . ':</b> ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
-            if (! empty($this->total_tva))
-                $label.= '<br><b>' . $langs->trans('LT2') . ':</b> ' . price($this->total_localtax2, 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_tva))
+                $label .= '<br><b>'.$langs->trans('LT1').':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
+            if (!empty($this->total_tva))
+                $label .= '<br><b>'.$langs->trans('LT2').':</b> '.price($this->total_localtax2, 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>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= ($max?dol_trunc($this->ref,$max):$this->ref);
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($max ?dol_trunc($this->ref, $max) : $this->ref);
 		$result .= $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>';
 		    }
 		}
 
@@ -1201,39 +1201,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, f.last_main_doc';
-		$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 IN ('.getEntity('facture').')';
-		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, f.last_main_doc';
+		$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 IN ('.getEntity('facture').')';
+		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);
@@ -1243,17 +1243,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;
@@ -1261,34 +1261,34 @@ 
 				$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->last_main_doc		= $obj->last_main_doc;
+				$this->user_valid = $obj->fk_user_valid;
+				$this->modelpdf = $obj->model_pdf;
+				$this->last_main_doc = $obj->last_main_doc;
 				$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;
@@ -1297,9 +1297,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;
 
@@ -1313,34 +1313,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;
 		}
 	}
@@ -1353,21 +1353,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);
@@ -1381,22 +1381,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;
@@ -1416,21 +1416,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;
@@ -1447,7 +1447,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -3;
 		}
 	}
@@ -1490,22 +1490,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';
 		}
@@ -1524,58 +1524,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
 			}
@@ -1584,13 +1584,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
 		{
@@ -1615,40 +1615,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'];
 			}
 
@@ -1661,17 +1661,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 link 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;
 					}
@@ -1681,14 +1681,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;
 			}
@@ -1707,11 +1707,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();
 
@@ -1723,27 +1723,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;
@@ -1753,13 +1753,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;
 		}
 	}
 
@@ -1771,12 +1771,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);
 
@@ -1785,21 +1785,21 @@ 
 
 		if ($test <= 0) return 0;
 
-		$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++;
@@ -1807,52 +1807,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)
@@ -1860,8 +1860,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
 					}
 				}
 			}
@@ -1878,31 +1878,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;
 							}
@@ -1914,14 +1914,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;
 			}
@@ -1942,9 +1942,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)
 		{
@@ -1952,28 +1952,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;
@@ -2001,31 +2001,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;
@@ -2048,7 +2048,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);
@@ -2056,10 +2056,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)
@@ -2067,14 +2067,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();
@@ -2087,14 +2087,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;
 		}
@@ -2110,14 +2110,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
@@ -2125,7 +2125,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;
@@ -2133,13 +2133,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;
 		}
@@ -2152,36 +2152,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;
 			}
@@ -2194,10 +2194,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);
 		}
@@ -2213,41 +2213,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)
@@ -2255,8 +2255,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++;
 							}
@@ -2266,15 +2266,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;
 
@@ -2295,13 +2295,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);
 	                        }
 						}
@@ -2309,22 +2309,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))
@@ -2346,7 +2346,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2404,11 +2404,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)
 		{
@@ -2419,20 +2419,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)
@@ -2440,24 +2440,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 {
@@ -2478,7 +2478,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -2523,11 +2523,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;
@@ -2536,63 +2536,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;
 				}
@@ -2613,7 +2613,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];
@@ -2627,72 +2627,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();
@@ -2700,14 +2700,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;
 			}
@@ -2748,17 +2748,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, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
 
@@ -2768,7 +2768,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;
 				}
 			}
@@ -2776,12 +2776,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);
@@ -2796,29 +2796,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];
@@ -2828,10 +2828,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);
@@ -2839,13 +2839,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;
 				}
@@ -2858,7 +2858,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;
@@ -2866,32 +2866,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;
@@ -2902,15 +2902,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);
@@ -2919,14 +2919,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;
 		}
 	}
@@ -2946,9 +2946,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;
 		}
 
@@ -2967,9 +2967,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;
@@ -2997,9 +2997,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;
 		}
 
@@ -3007,29 +3007,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)
 			{
@@ -3039,14 +3039,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;
 		}
 	}
@@ -3059,41 +3059,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);
@@ -3103,13 +3103,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;
 			}
 		}
 	}
@@ -3123,60 +3123,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;
 			}
 		}
 	}
@@ -3187,43 +3187,43 @@ 
 	 *	@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';
-		$sharedentity='facture';
+		$table = 'paiement_facture';
+		$table2 = 'paiement';
+		$field = 'fk_facture';
+		$field2 = 'fk_paiement';
+		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$table='paiementfourn_facturefourn';
-			$table2='paiementfourn';
-			$field='fk_facturefourn';
-			$field2='fk_paiementfourn';
-			$sharedentity='facture_fourn';
+			$table = 'paiementfourn_facturefourn';
+			$table2 = 'paiementfourn';
+			$field = 'fk_facturefourn';
+			$field2 = 'fk_paiementfourn';
+			$sharedentity = 'facture_fourn';
 		}
 
 		$sql = 'SELECT p.ref, 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 p.entity IN (' . getEntity($sharedentity).')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
+		$sql .= ' AND pf.'.$field2.' = p.rowid';
+		$sql .= ' AND p.fk_paiement = t.id';
+		$sql .= ' AND p.entity IN ('.getEntity($sharedentity).')';
+		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, 'ref'=>$obj->ref);
+				$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -3231,7 +3231,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
 		}
@@ -3246,21 +3246,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;
@@ -3275,16 +3275,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)
 				{
@@ -3292,27 +3292,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 "";
 			}
@@ -3336,11 +3336,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))
@@ -3351,7 +3351,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)
 				{
@@ -3361,7 +3361,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);
 		}
@@ -3385,30 +3385,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);
@@ -3429,7 +3429,7 @@ 
 					}
 					else
 					{
-						$ga[$i]['id']	= $obj->fid;
+						$ga[$i]['id'] = $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
 					}
@@ -3454,32 +3454,32 @@ 
 	 *	@param		int		$socid		Id thirdparty
 	 *	@return    	array				Array of invoices ('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);
 			}
@@ -3488,7 +3488,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3502,40 +3502,40 @@ 
 	 *	@param		int		$socid		Id thirdparty
 	 *	@return    	array				Array of invoices ($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);
 				}
 			}
 
@@ -3543,7 +3543,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3557,34 +3557,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;
@@ -3593,7 +3593,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)
 					{
@@ -3609,28 +3609,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);
         				}
         			}
 
@@ -3639,21 +3639,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;
         }
@@ -3671,13 +3671,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;
 		}
@@ -3697,33 +3697,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;
@@ -3740,7 +3740,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3755,7 +3755,7 @@ 
 	 */
 	function getIdBillingContact()
 	{
-		return $this->getIdContact('external','BILLING');
+		return $this->getIdContact('external', 'BILLING');
 	}
 
 	/**
@@ -3765,7 +3765,7 @@ 
 	 */
 	function getIdShippingContact()
 	{
-		return $this->getIdContact('external','SHIPPING');
+		return $this->getIdContact('external', 'SHIPPING');
 	}
 
 
@@ -3777,20 +3777,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)
 		{
@@ -3805,26 +3805,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')
 		{
@@ -3833,63 +3833,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;
@@ -3905,24 +3905,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++;
 		}
 	}
@@ -3936,27 +3936,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;
@@ -3964,7 +3964,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -3989,19 +3989,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;
 			}
 		}
@@ -4018,8 +4018,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)
@@ -4034,7 +4034,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;
 		}
 	}
@@ -4058,10 +4058,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) {
@@ -4073,7 +4073,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;
 		}
 
@@ -4087,45 +4087,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;
 		}
 	}
 
@@ -4141,7 +4141,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) {
@@ -4150,7 +4150,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 {
@@ -4199,8 +4199,8 @@ 
  */
 class FactureLigne extends CommonInvoiceLine
 {
-    public $element='facturedet';
-    public $table_element='facturedet';
+    public $element = 'facturedet';
+    public $table_element = 'facturedet';
 
 	var $oldline;
 
@@ -4216,9 +4216,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;
@@ -4226,7 +4226,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: ??
@@ -4248,15 +4248,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
 
@@ -4287,20 +4287,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)
@@ -4308,54 +4308,54 @@ 
 			$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->tva_npr              = ($objp->info_bits & 1 == 1) ? 1 : 0;
-			$this->special_code			= $objp->special_code;
+			$this->tva_npr = ($objp->info_bits & 1 == 1) ? 1 : 0;
+			$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);
 
@@ -4375,39 +4375,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)
@@ -4425,16 +4425,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;
 			}
 		}
@@ -4443,68 +4443,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++;
@@ -4515,8 +4515,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
@@ -4527,7 +4527,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;
@@ -4535,10 +4535,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;
@@ -4547,7 +4547,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;
@@ -4555,17 +4555,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();
@@ -4580,7 +4580,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4593,35 +4593,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;
@@ -4643,66 +4643,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();
@@ -4715,7 +4715,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4734,7 +4734,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();
@@ -4745,14 +4745,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;
 		}
@@ -4769,21 +4769,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();
@@ -4791,7 +4791,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -4810,18 +4810,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 +678 added lines, -361 removed lines

@@ -236,19 +236,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 should 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;
@@ -313,7 +324,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);
@@ -322,7 +335,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;
@@ -333,7 +348,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.
@@ -344,8 +361,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);
@@ -448,11 +471,16 @@ 
 			$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++;
+			}
 
-			if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+			if (! empty($this->linkedObjectsIds) && empty($this->linked_objects)) {
+				// To use new linkedObjectsIds instead of old linked_objects
 			{
-				$this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+				$this->linked_objects = $this->linkedObjectsIds;
+			}
+			// TODO Replace linked_objects with linkedObjectsIds
 			}
 
 			// Add object linked
@@ -460,19 +488,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)
 				            {
 				                $this->error=$this->db->lasterror();
 				                $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);
@@ -485,13 +514,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();
@@ -500,8 +533,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
 				        }
 				    }
@@ -518,16 +554,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)
@@ -561,8 +600,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;
 
@@ -574,7 +612,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)
 					{
@@ -585,7 +625,9 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
-						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
+						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) {
+							$vatrate.=' ('.$line->vat_src_code.')';
+						}
 
 						$result = $this->addline(
 							$line->desc,
@@ -648,7 +690,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);
 
@@ -708,7 +752,9 @@ 
 					if (! $error)
 					{
 					    $result=$this->insertExtraFields();
-					    if ($result < 0) $error++;
+					    if ($result < 0) {
+					    	$error++;
+					    }
 					}
 						/*}
 					}
@@ -716,35 +762,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();
@@ -822,8 +866,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');
 
@@ -859,8 +902,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;
@@ -902,26 +946,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++;
+				}
 			}
 		}
 
@@ -933,12 +982,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
 		}
 
@@ -949,8 +1002,7 @@ 
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -1011,8 +1063,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;
 		}
@@ -1035,8 +1088,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;
@@ -1055,15 +1109,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;
 	}
 
 	/**
@@ -1107,50 +1165,88 @@ 
 	{
 		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_tva))
-                $label.= '<br><b>' . $langs->trans('LT1') . ':</b> ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
-            if (! empty($this->total_tva))
-                $label.= '<br><b>' . $langs->trans('LT2') . ':</b> ' . price($this->total_localtax2, 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_tva)) {
+                            $label.= '<br><b>' . $langs->trans('LT1') . ':</b> ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
+            }
+            if (! empty($this->total_tva)) {
+                            $label.= '<br><b>' . $langs->trans('LT2') . ':</b> ' . price($this->total_localtax2, 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='';
@@ -1170,8 +1266,12 @@ 
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= ($max?dol_trunc($this->ref,$max):$this->ref);
+		if ($withpicto) {
+			$result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+			$result.= ($max?dol_trunc($this->ref,$max):$this->ref);
+		}
 		$result .= $linkend;
 
 		if ($addlinktonotes)
@@ -1205,7 +1305,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';
@@ -1230,10 +1332,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 IN ('.getEntity('facture').')';
-		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);
@@ -1308,7 +1418,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
@@ -1330,15 +1442,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;
@@ -1444,8 +1554,7 @@ 
 			}
 			$this->db->free($result);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -3;
@@ -1475,8 +1584,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;
+					}
 				}
 			}
 		}
@@ -1495,17 +1607,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';
 		}
@@ -1576,7 +1711,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('BILL_MODIFY',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 		}
@@ -1591,8 +1728,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -1620,9 +1756,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;
 			}
@@ -1678,22 +1816,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;
@@ -1716,10 +1851,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);
@@ -1739,7 +1875,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('BILL_MODIFY',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -1750,8 +1888,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -1783,7 +1920,9 @@ 
 		// Test to avoid invoice deletion (allowed if draft)
 		$test = $this->is_erasable();
 
-		if ($test <= 0) return 0;
+		if ($test <= 0) {
+			return 0;
+		}
 
 		$error=0;
 
@@ -1793,7 +1932,9 @@ 
 		{
             // Call trigger
             $result=$this->call_trigger('BILL_DELETE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
 		}
 
@@ -1811,7 +1952,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (! $error)
@@ -1860,8 +2003,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
 					}
 				}
 			}
@@ -1887,22 +2034,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;
 							}
@@ -1911,22 +2064,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;
@@ -1953,9 +2103,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);
@@ -1964,10 +2120,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();
@@ -1977,14 +2134,12 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2015,10 +2170,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();
@@ -2029,8 +2185,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2057,8 +2212,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);
@@ -2084,15 +2243,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();
@@ -2147,12 +2304,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;
 			}
@@ -2191,17 +2350,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;
 		}
@@ -2214,9 +2373,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;
@@ -2255,8 +2416,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++;
 							}
@@ -2270,7 +2434,9 @@ 
 			{
 	            // Call trigger
 	            $result=$this->call_trigger('BILL_VALIDATE',$user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 
@@ -2340,8 +2506,7 @@ 
     				}
                 }
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 		}
@@ -2350,8 +2515,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2440,8 +2604,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
 					}
 				}
 			}
@@ -2469,14 +2637,12 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -2536,17 +2702,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);
 
@@ -2570,14 +2758,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))
 		{
@@ -2689,7 +2878,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.
@@ -2697,22 +2888,19 @@ 
 				{
 					$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();
 				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;
@@ -2768,7 +2956,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;
 				}
 			}
@@ -2776,10 +2966,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);
@@ -2790,7 +2988,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
@@ -2910,21 +3110,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;
@@ -2954,8 +3154,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;
+		}
 	}
 
 	/**
@@ -2972,7 +3175,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];
@@ -3025,7 +3230,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)
 		{
@@ -3035,15 +3242,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;
@@ -3062,7 +3267,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)
 		{
@@ -3089,7 +3296,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('BILL_MODIFY',$user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3100,8 +3309,7 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				foreach($this->errors as $errmsg)
 				{
@@ -3125,7 +3333,9 @@ 
 	 */
 	function set_remise_absolue($user, $remise, $notrigger=0)
 	{
-		if (empty($remise)) $remise=0;
+		if (empty($remise)) {
+			$remise=0;
+		}
 
 		if ($user->rights->facture->creer)
 		{
@@ -3159,7 +3369,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('BILL_MODIFY',$user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3167,8 +3379,7 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				foreach($this->errors as $errmsg)
 				{
@@ -3212,7 +3423,9 @@ 
 		$sql.= ' AND pf.'.$field2.' = p.rowid';
 		$sql.= ' AND p.fk_paiement = t.id';
 		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
-		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);
@@ -3228,8 +3441,7 @@ 
 			}
 			$this->db->free($resql);
 			return $retarray;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_print_error($this->db);
@@ -3252,9 +3464,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))
 		{
@@ -3318,8 +3534,7 @@ 
 			}
 
 			return $numref;
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
@@ -3364,8 +3579,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);
 		}
@@ -3393,18 +3607,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);
 
@@ -3422,12 +3648,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;
@@ -3437,8 +3661,7 @@ 
 				}
 			}
 			return $ga;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3470,7 +3693,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);
@@ -3485,8 +3710,7 @@ 
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -3519,7 +3743,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);
@@ -3529,8 +3755,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;
@@ -3540,8 +3770,7 @@ 
 			}
 
 			return $return;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -3593,7 +3822,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)
 					{
@@ -3616,8 +3847,7 @@ 
 						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
 						    $error++;
 						}
-					}
-					else
+					} else
 					{
 						$this->error='WithdrawRequestErrorNilAmount';
 	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
@@ -3634,24 +3864,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");
@@ -3674,8 +3903,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);
@@ -3707,7 +3935,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)
@@ -3736,8 +3966,7 @@ 
 			}
 
 			return $response;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -3841,9 +4070,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;
@@ -3852,10 +4083,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;
@@ -3863,10 +4095,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;
@@ -3875,8 +4108,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];
@@ -3960,8 +4192,7 @@ 
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -4108,7 +4339,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('BILL_MODIFY',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -4116,8 +4349,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -4187,7 +4419,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);
 	}
@@ -4360,8 +4594,7 @@ 
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
+		} else
 		{
 		    $this->error = $this->db->lasterror();
 			return -1;
@@ -4387,27 +4620,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)
@@ -4415,8 +4688,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -4501,9 +4773,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)
             	{
@@ -4532,8 +4806,7 @@ 
     							$this->db->rollback();
     							return -3;
 						    }
-						}
-						else
+						} else
 						{
 							$result=$discount->link_to_invoice($this->rowid,0);
 							if ($result < 0)
@@ -4544,16 +4817,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);
@@ -4577,8 +4848,7 @@ 
 			$this->db->commit();
 			return $this->rowid;
 
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4603,28 +4873,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)
@@ -4632,8 +4940,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -4647,8 +4954,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)."";
@@ -4672,7 +4982,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;
@@ -4689,9 +5001,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)
         		{
@@ -4712,8 +5026,7 @@ 
 			}
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4749,8 +5062,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." sql=".$sql;
 			$this->db->rollback();
@@ -4769,8 +5081,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";
@@ -4788,8 +5104,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -4812,7 +5127,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/compta/prelevement/fiche-rejet.php

Spacing +30 added lines, -30 removed lines

@@ -31,26 +31,26 @@ 
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->loadLangs(array("banks","categories",'withdrawals','bills'));
+$langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
 // Securite acces client
 if ($user->societe_id > 0) accessforbidden();
 
 // Get supervariables
-$prev_id = GETPOST('id','int');
+$prev_id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$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;
 
-$object = new BonPrelevement($db,"");
+$object = new BonPrelevement($db, "");
 
 
 
@@ -59,7 +59,7 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalsReceipts"));
+llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id > 0 || $ref)
 {
@@ -75,7 +75,7 @@ 
 		print '<table class="border centpercent">'."\n";
 
 		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec,'day').'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
 		// Status
@@ -85,22 +85,22 @@ 
 		print '</tr>';
 		*/
 
-		if($object->date_trans <> 0)
+		if ($object->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($object->date_trans,'day');
+			print dol_print_date($object->date_trans, 'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if($object->date_credit <> 0)
+		if ($object->date_credit <> 0)
 		{
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($object->date_credit,'day');
+			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
 		}
 
@@ -112,7 +112,7 @@ 
 		print '<table class="border" width="100%">';
 
 		$acc = new Account($db);
-		$result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 
 		print '<tr><td class="titlefield">';
 		print $langs->trans("BankToReceiveWithdraw");
@@ -146,20 +146,20 @@ 
  * List errors
  */
 $sql = "SELECT pl.rowid, pl.amount, pl.statut";
-$sql.= " , s.rowid as socid, s.nom as name";
-$sql.= " , pr.motif, pr.afacturer, pr.fk_facture";
-$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql.= " , ".MAIN_DB_PREFIX."societe as s";
-$sql.= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
-$sql.= " WHERE p.rowid=".$prev_id;
-$sql.= " AND pl.fk_prelevement_bons = p.rowid";
-$sql.= " AND p.entity = ".$conf->entity;
-$sql.= " AND pl.fk_soc = s.rowid";
-$sql.= " AND pl.statut = 3 ";
-$sql.= " AND pr.fk_prelevement_lignes = pl.rowid";
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-$sql.= " ORDER BY pl.amount DESC";
+$sql .= " , s.rowid as socid, s.nom as name";
+$sql .= " , pr.motif, pr.afacturer, pr.fk_facture";
+$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql .= " , ".MAIN_DB_PREFIX."societe as s";
+$sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
+$sql .= " WHERE p.rowid=".$prev_id;
+$sql .= " AND pl.fk_prelevement_bons = p.rowid";
+$sql .= " AND p.entity = ".$conf->entity;
+$sql .= " AND pl.fk_soc = s.rowid";
+$sql .= " AND pl.statut = 3 ";
+$sql .= " AND pr.fk_prelevement_lignes = pl.rowid";
+if ($socid) $sql .= " AND s.rowid = ".$socid;
+$sql .= " ORDER BY pl.amount DESC";
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -169,7 +169,7 @@ 
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -179,7 +179,7 @@ 
  	print_barre_liste($langs->trans("Rejects"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
   	print"\n<!-- debut table -->\n";
-  	print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+  	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
   	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   	print '<tr class="liste_titre">';
   	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';

Braces +12 added lines, -10 removed lines

@@ -34,7 +34,9 @@ 
 $langs->loadLangs(array("banks","categories",'withdrawals','bills'));
 
 // Securite acces client
-if ($user->societe_id > 0) accessforbidden();
+if ($user->societe_id > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $prev_id = GETPOST('id','int');
@@ -118,8 +120,9 @@ 
 		print $langs->trans("BankToReceiveWithdraw");
 		print '</td>';
 		print '<td>';
-		if ($acc->id > 0)
-			print $acc->getNomUrl(1);
+		if ($acc->id > 0) {
+					print $acc->getNomUrl(1);
+		}
 		print '</td>';
 		print '</tr>';
 
@@ -133,8 +136,7 @@ 
 
 		dol_fiche_end();
 
-    }
-  	else
+    } else
     {
       	dol_print_error($db);
     }
@@ -158,7 +160,9 @@ 
 $sql.= " AND pl.fk_soc = s.rowid";
 $sql.= " AND pl.statut = 3 ";
 $sql.= " AND pr.fk_prelevement_lignes = pl.rowid";
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if ($socid) {
+	$sql.= " AND s.rowid = ".$socid;
+}
 $sql.= " ORDER BY pl.amount DESC";
 
 // Count total nb of records
@@ -213,8 +217,7 @@ 
 
     		$i++;
     	}
-	}
-	else
+	} else
 	{
 	   print '<tr><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
@@ -231,8 +234,7 @@ 
     print '</div>';
 
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

htdocs/compta/prelevement/fiche-stat.php

Spacing +23 added lines, -23 removed lines

@@ -29,34 +29,34 @@ 
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->loadLangs(array("banks","categories",'withdrawals','bills'));
+$langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
 
 // Get supervariables
-$prev_id = GETPOST('id','int');
+$prev_id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$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;
 
 
-$object = new BonPrelevement($db,"");
+$object = new BonPrelevement($db, "");
 
 
 /*
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalsReceipts"));
+llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id)
 {
@@ -72,7 +72,7 @@ 
 		print '<table class="border centpercent">'."\n";
 
 		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec,'day').'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
 		// Status
@@ -82,22 +82,22 @@ 
 		print '</tr>';
 		*/
 
-		if($object->date_trans <> 0)
+		if ($object->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($object->date_trans,'day');
+			print dol_print_date($object->date_trans, 'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if($object->date_credit <> 0)
+		if ($object->date_credit <> 0)
 		{
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($object->date_credit,'day');
+			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
 		}
 
@@ -109,7 +109,7 @@ 
 		print '<table class="border" width="100%">';
 
 		$acc = new Account($db);
-		$result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 
 		print '<tr><td class="titlefield">';
 		print $langs->trans("BankToReceiveWithdraw");
@@ -140,20 +140,20 @@ 
 	/*
 	 * Stats
 	 */
-	$ligne=new LignePrelevement($db,$user);
+	$ligne = new LignePrelevement($db, $user);
 
 	$sql = "SELECT sum(pl.amount), pl.statut";
-	$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-	$sql.= " WHERE pl.fk_prelevement_bons = ".$prev_id;
-	$sql.= " GROUP BY pl.statut";
+	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+	$sql .= " WHERE pl.fk_prelevement_bons = ".$prev_id;
+	$sql .= " GROUP BY pl.statut";
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-		print load_fiche_titre($langs->trans("StatisticsByLineStatus"),'','');
+		print load_fiche_titre($langs->trans("StatisticsByLineStatus"), '', '');
 
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -166,13 +166,13 @@ 
 
 			print '<tr class="oddeven"><td>';
 
-			print $ligne->LibStatut($row[1],1);
+			print $ligne->LibStatut($row[1], 1);
 
 			print '</td><td align="right">';
 			print price($row[0]);
 
 			print '</td><td align="right">';
-			if ($object->amount) print round($row[0]/$object->amount*100,2)." %";
+			if ($object->amount) print round($row[0] / $object->amount * 100, 2)." %";
 			print '</td>';
 
 			print "</tr>\n";
@@ -186,7 +186,7 @@ 
 	}
 	else
 	{
-		print $db->error() . ' ' . $sql;
+		print $db->error().' '.$sql;
 	}
 }
 

Braces +11 added lines, -8 removed lines

@@ -32,7 +32,9 @@ 
 $langs->loadLangs(array("banks","categories",'withdrawals','bills'));
 
 // Security check
-if ($user->societe_id > 0) accessforbidden();
+if ($user->societe_id > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $prev_id = GETPOST('id','int');
@@ -115,8 +117,9 @@ 
 		print $langs->trans("BankToReceiveWithdraw");
 		print '</td>';
 		print '<td>';
-		if ($acc->id > 0)
-			print $acc->getNomUrl(1);
+		if ($acc->id > 0) {
+					print $acc->getNomUrl(1);
+		}
 		print '</td>';
 		print '</tr>';
 
@@ -130,8 +133,7 @@ 
 
 		dol_fiche_end();
 
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		print $langs->trans("Error");
@@ -172,7 +174,9 @@ 
 			print price($row[0]);
 
 			print '</td><td align="right">';
-			if ($object->amount) print round($row[0]/$object->amount*100,2)." %";
+			if ($object->amount) {
+				print round($row[0]/$object->amount*100,2)." %";
+			}
 			print '</td>';
 
 			print "</tr>\n";
@@ -183,8 +187,7 @@ 
 
 		print "</table>";
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		print $db->error() . ' ' . $sql;
 	}

htdocs/projet/admin/project.php

Spacing +158 added lines, -158 removed lines

@@ -40,11 +40,11 @@ 
 
 if (!$user->admin) accessforbidden();
 
-$value = GETPOST('value','alpha');
-$action = GETPOST('action','alpha');
-$label = GETPOST('label','alpha');
-$scandir = GETPOST('scan_dir','alpha');
-$type='project';
+$value = GETPOST('value', 'alpha');
+$action = GETPOST('action', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'project';
 
 
 /*
@@ -55,23 +55,23 @@ 
 
 if ($action == 'setmainoptions')
 {
-	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
+	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES", GETPOST('PROJECT_USE_OPPORTUNITIES'), 'chaine', 0, '', $conf->entity);
 	else dolibarr_del_const($db, "PROJECT_USE_OPPORTUNITIES", $conf->entity);
 
 	if (GETPOST('PROJECT_USE_TASKS')) dolibarr_del_const($db, "PROJECT_HIDE_TASKS", $conf->entity);
-	else dolibarr_set_const($db, "PROJECT_HIDE_TASKS",1,'chaine',0,'',$conf->entity);
+	else dolibarr_set_const($db, "PROJECT_HIDE_TASKS", 1, 'chaine', 0, '', $conf->entity);
 }
 
 else if ($action == 'updateMask')
 {
-	$maskconstproject=GETPOST('maskconstproject','alpha');
-	$maskproject=GETPOST('maskproject','alpha');
+	$maskconstproject = GETPOST('maskconstproject', 'alpha');
+	$maskproject = GETPOST('maskproject', 'alpha');
 
-	if ($maskconstproject)  $res = dolibarr_set_const($db,$maskconstproject,$maskproject,'chaine',0,'',$conf->entity);
+	if ($maskconstproject)  $res = dolibarr_set_const($db, $maskconstproject, $maskproject, 'chaine', 0, '', $conf->entity);
 
-	if (! $res > 0) $error++;
+	if (!$res > 0) $error++;
 
-	if (! $error)
+	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
@@ -83,14 +83,14 @@ 
 
 if ($action == 'updateMaskTask')
 {
-	$maskconstmasktask=GETPOST('maskconsttask','alpha');
-	$masktaskt=GETPOST('masktask','alpha');
+	$maskconstmasktask = GETPOST('maskconsttask', 'alpha');
+	$masktaskt = GETPOST('masktask', 'alpha');
 
-	if ($maskconstmasktask)  $res = dolibarr_set_const($db,$maskconstmasktask,$masktaskt,'chaine',0,'',$conf->entity);
+	if ($maskconstmasktask)  $res = dolibarr_set_const($db, $maskconstmasktask, $masktaskt, 'chaine', 0, '', $conf->entity);
 
-	if (! $res > 0) $error++;
+	if (!$res > 0) $error++;
 
-	if (! $error)
+	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
@@ -102,20 +102,20 @@ 
 
 else if ($action == 'specimen')
 {
-	$modele=GETPOST('module','alpha');
+	$modele = GETPOST('module', 'alpha');
 
 	$project = new Project($db);
 	$project->initAsSpecimen();
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-		$file=dol_buildpath($reldir."core/modules/project/doc/pdf_".$modele.".modules.php",0);
+		$file = dol_buildpath($reldir."core/modules/project/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
-			$filefound=1;
+			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
@@ -127,7 +127,7 @@ 
 
 		$module = new $classname($db);
 
-		if ($module->write_file($project,$langs) > 0)
+		if ($module->write_file($project, $langs) > 0)
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
@@ -147,20 +147,20 @@ 
 
 else if ($action == 'specimentask')
 {
-	$modele=GETPOST('module','alpha');
+	$modele = GETPOST('module', 'alpha');
 
 	$project = new Project($db);
 	$project->initAsSpecimen();
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-		$file=dol_buildpath($reldir."core/modules/project/task/doc/pdf_".$modele.".modules.php",0);
+		$file = dol_buildpath($reldir."core/modules/project/task/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
-			$filefound=1;
+			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
@@ -172,7 +172,7 @@ 
 
 		$module = new $classname($db);
 
-		if ($module->write_file($project,$langs) > 0)
+		if ($module->write_file($project, $langs) > 0)
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
@@ -198,7 +198,7 @@ 
 // Activate a model for task
 else if ($action == 'settask')
 {
-	$ret = addDocumentModel($value,'project_task', $label, $scandir);
+	$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 }
 
 else if ($action == 'del')
@@ -206,7 +206,7 @@ 
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-		if ($conf->global->PROJECT_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_ADDON_PDF',$conf->entity);
+		if ($conf->global->PROJECT_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_ADDON_PDF', $conf->entity);
 	}
 }
 if ($action == 'deltask')
@@ -214,14 +214,14 @@ 
 	$ret = delDocumentModel($value, 'project_task');
 	if ($ret > 0)
 	{
-		if ($conf->global->PROJECT_TASK_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_TASK_ADDON_PDF',$conf->entity);
+		if ($conf->global->PROJECT_TASK_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_TASK_ADDON_PDF', $conf->entity);
 	}
 }
 
 // Set default model
 else if ($action == 'setdoc')
 {
-	dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "PROJECT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity);
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
@@ -233,7 +233,7 @@ 
 
 else if ($action == 'setdoctask')
 {
-	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
 		// La constante qui a ete lue en avant du nouveau set
 		// on passe donc par une variable pour avoir un affichage coherent
@@ -253,7 +253,7 @@ 
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
-	dolibarr_set_const($db, "PROJECT_ADDON",$value,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "PROJECT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 else if ($action == 'setmodtask')
@@ -261,7 +261,7 @@ 
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
-	dolibarr_set_const($db, "PROJECT_TASK_ADDON",$value,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "PROJECT_TASK_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 elseif ($action == 'updateoptions')
 {
@@ -278,7 +278,7 @@ 
 {
 	$projectToSelect = GETPOST('projectToSelect');
 	
-	dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity);	//Allow to disable this configuration if empty value
+	dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity); //Allow to disable this configuration if empty value
 }
 
 
@@ -286,24 +286,24 @@ 
  * View
  */
 
-$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-llxHeader("",$langs->trans("ProjectsSetup"));
+llxHeader("", $langs->trans("ProjectsSetup"));
 
-$form=new Form($db);
+$form = new Form($db);
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup');
 
-$head=project_admin_prepare_head();
+$head = project_admin_prepare_head();
 
 dol_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project');
 
 
 
 // Main options
-$form=new Form($db);
-$var=true;
+$form = new Form($db);
+$var = true;
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -320,7 +320,7 @@ 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("ManageOpportunitiesStatus").'</td>';
 print '<td width="60" align="right">';
-$arrval=array('0'=>$langs->trans("No"),
+$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes"),
 );
 print $form->selectyesno('PROJECT_USE_OPPORTUNITIES', $conf->global->PROJECT_USE_OPPORTUNITIES, 1);
@@ -333,10 +333,10 @@ 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("ManageTasks").'</td>';
 print '<td width="60" align="right">';
-$arrval=array('0'=>$langs->trans("No"),
+$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes"),
 );
-print $form->selectyesno('PROJECT_USE_TASKS', empty($conf->global->PROJECT_HIDE_TASKS)?1:0, 1);
+print $form->selectyesno('PROJECT_USE_TASKS', empty($conf->global->PROJECT_HIDE_TASKS) ? 1 : 0, 1);
 print '</td><td align="right">';
 print '<input type="submit" class="button" name="modifyPROJECT_USE_TASKS" value="'.$langs->trans("Modify").'">';
 print "</td>";
@@ -374,21 +374,21 @@ 
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
+			$var = true;
 
-			while (($file = readdir($handle))!==false)
+			while (($file = readdir($handle)) !== false)
 			{
-				if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
+				if (preg_match('/^(mod_.*)\.php$/i', $file, $reg))
 				{
 					$file = $reg[1];
-					$classname = substr($file,4);
+					$classname = substr($file, 4);
 
 					require_once $dir.$file.'.php';
 
 					$module = new $file;
 
 					// Show modules according to features level
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 					if ($module->isEnabled())
@@ -400,45 +400,45 @@ 
 
 						// Show example of numbering model
 						print '<td class="nowrap">';
-						$tmp=$module->getExample();
-						if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
 						print '<td align="center">';
 						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
 						{
-							print img_picto($langs->trans("Activated"),'switch_on');
+							print img_picto($langs->trans("Activated"), 'switch_on');
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
-						$project=new Project($db);
+						$project = new Project($db);
 						$project->initAsSpecimen();
 
 						// Info
-						$htmltooltip='';
-						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-						$nextval=$module->getNextValue($mysoc,$project);
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $project);
 						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
 						{
-							$htmltooltip.=''.$langs->trans("NextValue").': ';
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
 							if ($nextval)
 							{
-								$htmltooltip.=$nextval.'<br>';
+								$htmltooltip .= $nextval.'<br>';
 							}
 							else
 							{
-								$htmltooltip.=$langs->trans($module->error).'<br>';
+								$htmltooltip .= $langs->trans($module->error).'<br>';
 							}
 						}
 
 						print '<td align="center">';
-						print $form->textwithpicto('',$htmltooltip,1,0);
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
 						print '</td>';
 
 						print '</tr>';
@@ -478,21 +478,21 @@ 
 			$handle = opendir($dir);
 			if (is_resource($handle))
 			{
-				$var=true;
+				$var = true;
 
-				while (($file = readdir($handle))!==false)
+				while (($file = readdir($handle)) !== false)
 				{
-					if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
+					if (preg_match('/^(mod_.*)\.php$/i', $file, $reg))
 					{
 						$file = $reg[1];
-						$classname = substr($file,4);
+						$classname = substr($file, 4);
 
 						require_once $dir.$file.'.php';
 
 						$module = new $file;
 
 						// Show modules according to features level
-						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 						if ($module->isEnabled())
@@ -504,45 +504,45 @@ 
 
 							// Show example of numbering module
 							print '<td class="nowrap">';
-							$tmp=$module->getExample();
-							if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-							elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 							else print $tmp;
 							print '</td>'."\n";
 
 							print '<td align="center">';
 							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
 							{
-								print img_picto($langs->trans("Activated"),'switch_on');
+								print img_picto($langs->trans("Activated"), 'switch_on');
 							}
 							else
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
-							$project=new Project($db);
+							$project = new Project($db);
 							$project->initAsSpecimen();
 
 							// Info
-							$htmltooltip='';
-							$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-							$nextval=$module->getNextValue($mysoc,$project);
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $project);
 							if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
 							{
-								$htmltooltip.=''.$langs->trans("NextValue").': ';
+								$htmltooltip .= ''.$langs->trans("NextValue").': ';
 								if ($nextval)
 								{
-									$htmltooltip.=$nextval.'<br>';
+									$htmltooltip .= $nextval.'<br>';
 								}
 								else
 								{
-									$htmltooltip.=$langs->trans($module->error).'<br>';
+									$htmltooltip .= $langs->trans($module->error).'<br>';
 								}
 							}
 
 							print '<td align="center">';
-							print $form->textwithpicto('',$htmltooltip,1,0);
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
 							print '</td>';
 
 							print '</tr>';
@@ -565,19 +565,19 @@ 
 print load_fiche_titre($langs->trans("ProjectsModelModule"), '', '');
 
 // Defini tableau def de modele
-$type='project';
+$type = 'project';
 $def = array();
 
 $sql = "SELECT nom";
-$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = '".$type."'";
-$sql.= " AND entity = ".$conf->entity;
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = '".$type."'";
+$sql .= " AND entity = ".$conf->entity;
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$i = 0;
-	$num_rows=$db->num_rows($resql);
+	$num_rows = $db->num_rows($resql);
 	while ($i < $num_rows)
 	{
 		$array = $db->fetch_array($resql);
@@ -602,48 +602,48 @@ 
 
 clearstatcache();
 
-$var=true;
+$var = true;
 foreach ($dirmodels as $reldir)
 {
-	foreach (array('','/doc') as $valdir)
+	foreach (array('', '/doc') as $valdir)
 	{
 		$dir = dol_buildpath($reldir."core/modules/project/".$valdir);
 
 		if (is_dir($dir))
 		{
-			$handle=opendir($dir);
+			$handle = opendir($dir);
 			if (is_resource($handle))
 			{
-				while (($file = readdir($handle))!==false)
+				while (($file = readdir($handle)) !== false)
 				{
-					$filelist[]=$file;
+					$filelist[] = $file;
 				}
 				closedir($handle);
 				arsort($filelist);
 
-				foreach($filelist as $file)
+				foreach ($filelist as $file)
 				{
-					if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
 					{
 						if (file_exists($dir.'/'.$file))
 						{
-							$name = substr($file, 4, dol_strlen($file) -16);
-							$classname = substr($file, 0, dol_strlen($file) -12);
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
 							require_once $dir.'/'.$file;
 							$module = new $classname($db);
 
-							$modulequalified=1;
-							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
 							if ($modulequalified)
 							{
 
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name)?$name:$module->name);
+								print (empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
-								if (method_exists($module,'info')) print $module->info($langs);
+								if (method_exists($module, 'info')) print $module->info($langs);
 								else print $module->description;
 								print "</td>\n";
 
@@ -652,14 +652,14 @@ 
 								{
 									print "<td align=\"center\">\n";
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-									print img_picto($langs->trans("Enabled"),'switch_on');
+									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print "</td>";
 								}
 								else
 								{
 									print "<td align=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
 								}
 
@@ -667,37 +667,37 @@ 
 								print "<td align=\"center\">";
 								if ($conf->global->PROJECT_ADDON_PDF == "$name")
 								{
-									print img_picto($langs->trans("Default"),'on');
+									print img_picto($langs->trans("Default"), 'on');
 								}
 								else
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
 								// Info
-								$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-								$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
 								if ($module->type == 'pdf')
 								{
-									$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 								}
-								$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-								$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 
 								print '<td align="center">';
-								print $form->textwithpicto('',$htmltooltip,1,0);
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
 								print '</td>';
 
 								// Preview
 								print '<td align="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 								}
 								else
 								{
-									print img_object($langs->trans("PreviewNotAvailable"),'generic');
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
 								print '</td>';
 
@@ -724,19 +724,19 @@ 
 	print load_fiche_titre($langs->trans("TaskModelModule"), '', '');
 
 	// Defini tableau def de modele
-	$type='project_task';
+	$type = 'project_task';
 	$def = array();
 
 	$sql = "SELECT nom";
-	$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-	$sql.= " WHERE type = '".$type."'";
-	$sql.= " AND entity = ".$conf->entity;
+	$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+	$sql .= " WHERE type = '".$type."'";
+	$sql .= " AND entity = ".$conf->entity;
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$i = 0;
-		$num_rows=$db->num_rows($resql);
+		$num_rows = $db->num_rows($resql);
 		while ($i < $num_rows)
 		{
 			$array = $db->fetch_array($resql);
@@ -761,48 +761,48 @@ 
 
 	clearstatcache();
 
-	$var=true;
+	$var = true;
 	foreach ($dirmodels as $reldir)
 	{
-		foreach (array('','/doc') as $valdir)
+		foreach (array('', '/doc') as $valdir)
 		{
 			$dir = dol_buildpath($reldir."core/modules/project/task/".$valdir);
 
 			if (is_dir($dir))
 			{
-				$handle=opendir($dir);
+				$handle = opendir($dir);
 				if (is_resource($handle))
 				{
-					while (($file = readdir($handle))!==false)
+					while (($file = readdir($handle)) !== false)
 					{
-						$filelist[]=$file;
+						$filelist[] = $file;
 					}
 					closedir($handle);
 					arsort($filelist);
 
-					foreach($filelist as $file)
+					foreach ($filelist as $file)
 					{
-						if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+						if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
 						{
 							if (file_exists($dir.'/'.$file))
 							{
-								$name = substr($file, 4, dol_strlen($file) -16);
-								$classname = substr($file, 0, dol_strlen($file) -12);
+								$name = substr($file, 4, dol_strlen($file) - 16);
+								$classname = substr($file, 0, dol_strlen($file) - 12);
 
 								require_once $dir.'/'.$file;
 								$module = new $classname($db);
 
-								$modulequalified=1;
-								if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+								$modulequalified = 1;
+								if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
 								if ($modulequalified)
 								{
 									$var = !$var;
 									print '<tr class="oddeven"><td width="100">';
-									print (empty($module->name)?$name:$module->name);
+									print (empty($module->name) ? $name : $module->name);
 									print "</td><td>\n";
-									if (method_exists($module,'info')) print $module->info($langs);
+									if (method_exists($module, 'info')) print $module->info($langs);
 									else print $module->description;
 									print "</td>\n";
 
@@ -811,14 +811,14 @@ 
 									{
 										print "<td align=\"center\">\n";
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-										print img_picto($langs->trans("Enabled"),'switch_on');
+										print img_picto($langs->trans("Enabled"), 'switch_on');
 										print '</a>';
 										print "</td>";
 									}
 									else
 									{
 										print "<td align=\"center\">\n";
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 										print "</td>";
 									}
 
@@ -826,37 +826,37 @@ 
 									print "<td align=\"center\">";
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
 									{
-										print img_picto($langs->trans("Default"),'on');
+										print img_picto($langs->trans("Default"), 'on');
 									}
 									else
 									{
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 									}
 									print '</td>';
 
 									// Info
-									$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-									$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+									$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+									$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
 									if ($module->type == 'pdf')
 									{
-										$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+										$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 									}
-									$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-									$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+									$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+									$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 
 									print '<td align="center">';
-									print $form->textwithpicto('',$htmltooltip,1,0);
+									print $form->textwithpicto('', $htmltooltip, 1, 0);
 									print '</td>';
 
 									// Preview
 									print '<td align="center">';
 									if ($module->type == 'pdf')
 									{
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 									}
 									else
 									{
-										print img_object($langs->trans("PreviewNotAvailable"),'generic');
+										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 									}
 									print '</td>';
 									print "</tr>\n";
@@ -876,8 +876,8 @@ 
 print load_fiche_titre($langs->trans("Other"), '', '');
 
 // Other options
-$form=new Form($db);
-$var=true;
+$form = new Form($db);
+$var = true;
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -893,7 +893,7 @@ 
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("UseSearchToSelectProject").'</td>';
-if (! $conf->use_javascript_ajax)
+if (!$conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
@@ -902,12 +902,12 @@ 
 else
 {
 	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
-		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
-		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
+	$arrval = array('0'=>$langs->trans("No"),
+		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
-	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT",$arrval,$conf->global->PROJECT_USE_SEARCH_TO_SELECT);
+	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
 	print '<input type="submit" class="button" name="PROJECT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";

Braces +113 added lines, -94 removed lines

@@ -38,7 +38,9 @@ 
 $langs->load("other");
 $langs->load("projects");
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $value = GETPOST('value','alpha');
 $action = GETPOST('action','alpha');
@@ -55,27 +57,34 @@ 
 
 if ($action == 'setmainoptions')
 {
-	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
-	else dolibarr_del_const($db, "PROJECT_USE_OPPORTUNITIES", $conf->entity);
-
-	if (GETPOST('PROJECT_USE_TASKS')) dolibarr_del_const($db, "PROJECT_HIDE_TASKS", $conf->entity);
-	else dolibarr_set_const($db, "PROJECT_HIDE_TASKS",1,'chaine',0,'',$conf->entity);
-}
+	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) {
+		dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
+	} else {
+		dolibarr_del_const($db, "PROJECT_USE_OPPORTUNITIES", $conf->entity);
+	}
 
-else if ($action == 'updateMask')
+	if (GETPOST('PROJECT_USE_TASKS')) {
+		dolibarr_del_const($db, "PROJECT_HIDE_TASKS", $conf->entity);
+	} else {
+		dolibarr_set_const($db, "PROJECT_HIDE_TASKS",1,'chaine',0,'',$conf->entity);
+	}
+	} else if ($action == 'updateMask')
 {
 	$maskconstproject=GETPOST('maskconstproject','alpha');
 	$maskproject=GETPOST('maskproject','alpha');
 
-	if ($maskconstproject)  $res = dolibarr_set_const($db,$maskconstproject,$maskproject,'chaine',0,'',$conf->entity);
+	if ($maskconstproject) {
+		$res = dolibarr_set_const($db,$maskconstproject,$maskproject,'chaine',0,'',$conf->entity);
+	}
 
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+		$error++;
+	}
 
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -86,21 +95,22 @@ 
 	$maskconstmasktask=GETPOST('maskconsttask','alpha');
 	$masktaskt=GETPOST('masktask','alpha');
 
-	if ($maskconstmasktask)  $res = dolibarr_set_const($db,$maskconstmasktask,$masktaskt,'chaine',0,'',$conf->entity);
+	if ($maskconstmasktask) {
+		$res = dolibarr_set_const($db,$maskconstmasktask,$masktaskt,'chaine',0,'',$conf->entity);
+	}
 
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+		$error++;
+	}
 
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-else if ($action == 'specimen')
+} else if ($action == 'specimen')
 {
 	$modele=GETPOST('module','alpha');
 
@@ -131,21 +141,17 @@ 
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
-		}
-		else
+		} else
 		{
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-else if ($action == 'specimentask')
+} else if ($action == 'specimentask')
 {
 	$modele=GETPOST('module','alpha');
 
@@ -176,14 +182,12 @@ 
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
-		}
-		else
+		} else
 		{
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
@@ -199,14 +203,14 @@ 
 else if ($action == 'settask')
 {
 	$ret = addDocumentModel($value,'project_task', $label, $scandir);
-}
-
-else if ($action == 'del')
+} else if ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-		if ($conf->global->PROJECT_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_ADDON_PDF',$conf->entity);
+		if ($conf->global->PROJECT_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'PROJECT_ADDON_PDF',$conf->entity);
+		}
 	}
 }
 if ($action == 'deltask')
@@ -214,7 +218,9 @@ 
 	$ret = delDocumentModel($value, 'project_task');
 	if ($ret > 0)
 	{
-		if ($conf->global->PROJECT_TASK_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_TASK_ADDON_PDF',$conf->entity);
+		if ($conf->global->PROJECT_TASK_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'PROJECT_TASK_ADDON_PDF',$conf->entity);
+		}
 	}
 }
 
@@ -229,9 +235,7 @@ 
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-else if ($action == 'setdoctask')
+} else if ($action == 'setdoctask')
 {
 	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
 	{
@@ -246,24 +250,19 @@ 
 	{
 		$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 	}
-}
-
-else if ($action == 'setmod')
+} else if ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_ADDON",$value,'chaine',0,'',$conf->entity);
-}
-
-else if ($action == 'setmodtask')
+} else if ($action == 'setmodtask')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON",$value,'chaine',0,'',$conf->entity);
-}
-elseif ($action == 'updateoptions')
+} elseif ($action == 'updateoptions')
 {
 	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT'))
 	{
@@ -273,8 +272,7 @@ 
 			$conf->global->PROJECT_USE_SEARCH_TO_SELECT = $companysearch;
 		}
 	}
-}
-else if ($action == "linkOtherCompany")
+} else if ($action == "linkOtherCompany")
 {
 	$projectToSelect = GETPOST('projectToSelect');
 	
@@ -388,8 +386,12 @@ 
 					$module = new $file;
 
 					// Show modules according to features level
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						continue;
+					}
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						continue;
+					}
 
 					if ($module->isEnabled())
 					{
@@ -401,17 +403,20 @@ 
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp=$module->getExample();
-						if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
+						if (preg_match('/^Error/',$tmp)) {
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp=='NotConfigured') {
+							print $langs->trans($tmp);
+						} else {
+							print $tmp;
+						}
 						print '</td>'."\n";
 
 						print '<td align="center">';
 						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
 						{
 							print img_picto($langs->trans("Activated"),'switch_on');
-						}
-						else
+						} else
 						{
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 						}
@@ -424,14 +429,15 @@ 
 						$htmltooltip='';
 						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval=$module->getNextValue($mysoc,$project);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
+						if ("$nextval" != $langs->trans("NotAvailable")) {
+							// Keep " on nextval
 						{
 							$htmltooltip.=''.$langs->trans("NextValue").': ';
+						}
 							if ($nextval)
 							{
 								$htmltooltip.=$nextval.'<br>';
-							}
-							else
+							} else
 							{
 								$htmltooltip.=$langs->trans($module->error).'<br>';
 							}
@@ -492,8 +498,12 @@ 
 						$module = new $file;
 
 						// Show modules according to features level
-						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							continue;
+						}
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							continue;
+						}
 
 						if ($module->isEnabled())
 						{
@@ -505,17 +515,20 @@ 
 							// Show example of numbering module
 							print '<td class="nowrap">';
 							$tmp=$module->getExample();
-							if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-							elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-							else print $tmp;
+							if (preg_match('/^Error/',$tmp)) {
+								print '<div class="error">'.$langs->trans($tmp).'</div>';
+							} elseif ($tmp=='NotConfigured') {
+								print $langs->trans($tmp);
+							} else {
+								print $tmp;
+							}
 							print '</td>'."\n";
 
 							print '<td align="center">';
 							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
 							{
 								print img_picto($langs->trans("Activated"),'switch_on');
-							}
-							else
+							} else
 							{
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 							}
@@ -528,14 +541,15 @@ 
 							$htmltooltip='';
 							$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 							$nextval=$module->getNextValue($mysoc,$project);
-							if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
+							if ("$nextval" != $langs->trans("NotAvailable")) {
+								// Keep " on nextval
 							{
 								$htmltooltip.=''.$langs->trans("NextValue").': ';
+							}
 								if ($nextval)
 								{
 									$htmltooltip.=$nextval.'<br>';
-								}
-								else
+								} else
 								{
 									$htmltooltip.=$langs->trans($module->error).'<br>';
 								}
@@ -584,8 +598,7 @@ 
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -634,8 +647,12 @@ 
 							$module = new $classname($db);
 
 							$modulequalified=1;
-							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								$modulequalified=0;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								$modulequalified=0;
+							}
 
 							if ($modulequalified)
 							{
@@ -643,8 +660,11 @@ 
 								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name)?$name:$module->name);
 								print "</td><td>\n";
-								if (method_exists($module,'info')) print $module->info($langs);
-								else print $module->description;
+								if (method_exists($module,'info')) {
+									print $module->info($langs);
+								} else {
+									print $module->description;
+								}
 								print "</td>\n";
 
 								// Active
@@ -655,8 +675,7 @@ 
 									print img_picto($langs->trans("Enabled"),'switch_on');
 									print '</a>';
 									print "</td>";
-								}
-								else
+								} else
 								{
 									print "<td align=\"center\">\n";
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
@@ -668,8 +687,7 @@ 
 								if ($conf->global->PROJECT_ADDON_PDF == "$name")
 								{
 									print img_picto($langs->trans("Default"),'on');
-								}
-								else
+								} else
 								{
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 								}
@@ -694,8 +712,7 @@ 
 								if ($module->type == 'pdf')
 								{
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-								}
-								else
+								} else
 								{
 									print img_object($langs->trans("PreviewNotAvailable"),'generic');
 								}
@@ -743,8 +760,7 @@ 
 			array_push($def, $array[0]);
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -793,8 +809,12 @@ 
 								$module = new $classname($db);
 
 								$modulequalified=1;
-								if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+								if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									$modulequalified=0;
+								}
+								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									$modulequalified=0;
+								}
 
 								if ($modulequalified)
 								{
@@ -802,8 +822,11 @@ 
 									print '<tr class="oddeven"><td width="100">';
 									print (empty($module->name)?$name:$module->name);
 									print "</td><td>\n";
-									if (method_exists($module,'info')) print $module->info($langs);
-									else print $module->description;
+									if (method_exists($module,'info')) {
+										print $module->info($langs);
+									} else {
+										print $module->description;
+									}
 									print "</td>\n";
 
 									// Active
@@ -814,8 +837,7 @@ 
 										print img_picto($langs->trans("Enabled"),'switch_on');
 										print '</a>';
 										print "</td>";
-									}
-									else
+									} else
 									{
 										print "<td align=\"center\">\n";
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
@@ -827,8 +849,7 @@ 
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
 									{
 										print img_picto($langs->trans("Default"),'on');
-									}
-									else
+									} else
 									{
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 									}
@@ -853,8 +874,7 @@ 
 									if ($module->type == 'pdf')
 									{
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-									}
-									else
+									} else
 									{
 										print img_object($langs->trans("PreviewNotAvailable"),'generic');
 									}
@@ -898,8 +918,7 @@ 
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
+} else
 {
 	print '<td width="60" align="right">';
 	$arrval=array('0'=>$langs->trans("No"),

htdocs/core/lib/payments.lib.php

Indentation +88 added lines, -88 removed lines

@@ -36,11 +36,11 @@ 
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
@@ -71,11 +71,11 @@ 
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
@@ -229,82 +229,82 @@ 
  */
 function htmlPrintOnlinePaymentFooter($fromcompany,$langs,$addformmessage=0,$suffix='',$object=null)
 {
-    global $conf;
-
-    // Juridical status
-    $line1="";
-    if ($fromcompany->forme_juridique_code)
-    {
-        $line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-    }
-    // Capital
-    if ($fromcompany->capital)
-    {
-        $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-    }
-    // Prof Id 1
-    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-    {
-        $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
-    }
-    // Prof Id 2
-    if ($fromcompany->idprof2)
-    {
-        $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
-    }
-
-    // Second line of company infos
-    $line2="";
-    // Prof Id 3
-    if ($fromcompany->idprof3)
-    {
-        $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
-    }
-    // Prof Id 4
-    if ($fromcompany->idprof4)
-    {
-        $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
-    }
-    // IntraCommunautary VAT
-    if ($fromcompany->tva_intra != '')
-    {
-        $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-    }
-
-    print '<br>';
-
-    print '<div class="center">'."\n";
-    if ($addformmessage)
-    {
-    	print '<!-- object = '.$object->element.' -->';
-    	print '<br>';
-
-    	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
-
-    	// Add other message if VAT exists
-    	if ($object->total_vat != 0 || $object->total_tva != 0)
-    	{
-    		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
-    	}
-    }
-
-    print '<font style="font-size: 10px;"><br><hr>'."\n";
-    print $fromcompany->name.'<br>';
-    print $line1;
-    if (strlen($line1+$line2) > 50) print '<br>';
-    else print ' - ';
-    print $line2;
-    print '</font></div>'."\n";
+	global $conf;
+
+	// Juridical status
+	$line1="";
+	if ($fromcompany->forme_juridique_code)
+	{
+		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+	}
+	// Capital
+	if ($fromcompany->capital)
+	{
+		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+	}
+	// Prof Id 1
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+	{
+		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+	}
+	// Prof Id 2
+	if ($fromcompany->idprof2)
+	{
+		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+	}
+
+	// Second line of company infos
+	$line2="";
+	// Prof Id 3
+	if ($fromcompany->idprof3)
+	{
+		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+	}
+	// Prof Id 4
+	if ($fromcompany->idprof4)
+	{
+		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+	}
+	// IntraCommunautary VAT
+	if ($fromcompany->tva_intra != '')
+	{
+		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+	}
+
+	print '<br>';
+
+	print '<div class="center">'."\n";
+	if ($addformmessage)
+	{
+		print '<!-- object = '.$object->element.' -->';
+		print '<br>';
+
+		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+		else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+
+		// Add other message if VAT exists
+		if ($object->total_vat != 0 || $object->total_tva != 0)
+		{
+			$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+			if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+			else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+		}
+	}
+
+	print '<font style="font-size: 10px;"><br><hr>'."\n";
+	print $fromcompany->name.'<br>';
+	print $line1;
+	if (strlen($line1+$line2) > 50) print '<br>';
+	else print ' - ';
+	print $line2;
+	print '</font></div>'."\n";
 }

Spacing +84 added lines, -84 removed lines

@@ -40,14 +40,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment', 'remove');
 
 	return $head;
 }
@@ -75,14 +75,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier', 'remove');
 
 	return $head;
 }
@@ -95,18 +95,18 @@ 
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type,$ref)
+function showOnlinePaymentUrl($type, $ref)
 {
 	global $conf, $langs;
 
 	$langs->load("payment");
 	$langs->load("paybox");
-	$servicename='Online';
+	$servicename = 'Online';
 
-	$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
-	$url = getOnlinePaymentUrl(0,$type,$ref);
-	$out.= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
-	$out.= ajax_autoselect("onlinepaymenturl", 0);
+	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+	$url = getOnlinePaymentUrl(0, $type, $ref);
+	$out .= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
+	$out .= ajax_autoselect("onlinepaymenturl", 0);
 	return $out;
 }
 
@@ -120,97 +120,97 @@ 
  * @param	string	$freetag	Free tag
  * @return	string				Url string
  */
-function getOnlinePaymentUrl($mode, $type, $ref='', $amount='9.99', $freetag='your_free_tag')
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_free_tag')
 {
 	global $conf;
 
-	$ref=str_replace(' ','',$ref);
-	$out='';
+	$ref = str_replace(' ', '', $ref);
+	$out = '';
 
 	if ($type == 'free')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}
 	}
 	if ($type == 'order')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='order_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'order_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	if ($type == 'invoice')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='invoice_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'invoice_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	if ($type == 'contractline')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='contractline_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'contractline_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	if ($type == 'membersubscription')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='member_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'member_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 
 	// For multicompany
-	if (! empty($out)) $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (!empty($out)) $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
 	return $out;
 }
@@ -227,56 +227,56 @@ 
  * @param	Object		$object			Object related to payment
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany,$langs,$addformmessage=0,$suffix='',$object=null)
+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
 {
     global $conf;
 
     // Juridical status
-    $line1="";
+    $line1 = "";
     if ($fromcompany->forme_juridique_code)
     {
-        $line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+        $line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
     }
     // Capital
     if ($fromcompany->capital)
     {
-        $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+        $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
     }
     // Prof Id 1
-    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
     {
-        $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+        $field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
     }
     // Prof Id 2
     if ($fromcompany->idprof2)
     {
-        $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+        $field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
     }
 
     // Second line of company infos
-    $line2="";
+    $line2 = "";
     // Prof Id 3
     if ($fromcompany->idprof3)
     {
-        $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+        $field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
     }
     // Prof Id 4
     if ($fromcompany->idprof4)
     {
-        $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+        $field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
     }
     // IntraCommunautary VAT
     if ($fromcompany->tva_intra != '')
     {
-        $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+        $line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
     }
 
     print '<br>';
@@ -287,23 +287,23 @@ 
     	print '<!-- object = '.$object->element.' -->';
     	print '<br>';
 
-    	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+    	$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+    	if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+    	else if (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
 
     	// Add other message if VAT exists
     	if ($object->total_vat != 0 || $object->total_tva != 0)
     	{
-    		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+    		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+    		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+    		else if (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
     	}
     }
 
     print '<font style="font-size: 10px;"><br><hr>'."\n";
     print $fromcompany->name.'<br>';
     print $line1;
-    if (strlen($line1+$line2) > 50) print '<br>';
+    if (strlen($line1 + $line2) > 50) print '<br>';
     else print ' - ';
     print $line2;
     print '</font></div>'."\n";

Braces +96 added lines, -37 removed lines

@@ -132,24 +132,36 @@ 
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
+				$out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			}
 		}
 	}
 	if ($type == 'order')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='order_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+			$out.='order_ref';
+		}
+		if ($mode == 0) {
+			$out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+					$out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+				}
+				if ($mode == 0) {
+					$out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
@@ -157,17 +169,26 @@ 
 	if ($type == 'invoice')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='invoice_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+			$out.='invoice_ref';
+		}
+		if ($mode == 0) {
+			$out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+					$out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				}
+				if ($mode == 0) {
+					$out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
@@ -175,17 +196,26 @@ 
 	if ($type == 'contractline')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='contractline_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+			$out.='contractline_ref';
+		}
+		if ($mode == 0) {
+			$out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+					$out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+				}
+				if ($mode == 0) {
+					$out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
@@ -193,24 +223,36 @@ 
 	if ($type == 'membersubscription')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='member_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+			$out.='member_ref';
+		}
+		if ($mode == 0) {
+			$out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+					$out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+				}
+				if ($mode == 0) {
+					$out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
 	}
 
 	// For multicompany
-	if (! empty($out)) $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (! empty($out)) {
+		$out.="&entity=".$conf->entity;
+	}
+	// Check the entity because He may be the same reference in several entities
 
 	return $out;
 }
@@ -246,14 +288,18 @@ 
     if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
     {
         $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+        	$field=$reg[1];
+        }
         $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
     }
     // Prof Id 2
     if ($fromcompany->idprof2)
     {
         $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+        	$field=$reg[1];
+        }
         $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
     }
 
@@ -263,14 +309,18 @@ 
     if ($fromcompany->idprof3)
     {
         $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+        	$field=$reg[1];
+        }
         $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
     }
     // Prof Id 4
     if ($fromcompany->idprof4)
     {
         $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+        	$field=$reg[1];
+        }
         $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
     }
     // IntraCommunautary VAT
@@ -288,23 +338,32 @@ 
     	print '<br>';
 
     	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+    	if (! empty($conf->global->$parammessageform)) {
+    		print $langs->transnoentities($conf->global->$parammessageform);
+    	} else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) {
+    		print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+    	}
 
     	// Add other message if VAT exists
     	if ($object->total_vat != 0 || $object->total_tva != 0)
     	{
     		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+    		if (! empty($conf->global->$parammessageform)) {
+    			print $langs->transnoentities($conf->global->$parammessageform);
+    		} else if (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) {
+    			print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+    		}
     	}
     }
 
     print '<font style="font-size: 10px;"><br><hr>'."\n";
     print $fromcompany->name.'<br>';
     print $line1;
-    if (strlen($line1+$line2) > 50) print '<br>';
-    else print ' - ';
+    if (strlen($line1+$line2) > 50) {
+    	print '<br>';
+    } else {
+    	print ' - ';
+    }
     print $line2;
     print '</font></div>'."\n";
 }