alxarafe / alixar

dolibarr/htdocs/expedition/stats/index.php

Spacing +35 added lines, -35 removed lines

@@ -28,11 +28,11 @@ 
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
+$userid = GETPOST('userid', 'int');
+$socid = GETPOST('socid', 'int');
 // Security check
 if ($user->societe_id > 0)
 {
@@ -40,11 +40,11 @@ 
     $socid = $user->societe_id;
 }
 
-$nowyear=strftime("%Y", dol_now());
-$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+$nowyear = strftime("%Y", dol_now());
+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
 //$startyear=$year-2;
-$startyear=$year-1;
-$endyear=$year;
+$startyear = $year - 1;
+$endyear = $year;
 
 // Load translation files required by the page
 $langs->loadLangs(array('sendings', 'other', 'companies'));
@@ -54,7 +54,7 @@ 
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
 llxHeader();
 
@@ -63,10 +63,10 @@ 
 
 dol_mkdir($dir);
 
-$stats = new ExpeditionStats($db, $socid, $mode, ($userid>0?$userid:0));
+$stats = new ExpeditionStats($db, $socid, $mode, ($userid > 0 ? $userid : 0));
 
 // Build graphic number of object
-$data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
+$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);exit;
 // $data = array(array('Lib',val1,val2,val3),...)
 
@@ -86,29 +86,29 @@ 
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px1->SetData($data);
     $px1->SetPrecisionY(0);
-    $i=$startyear;$legend=array();
+    $i = $startyear; $legend = array();
     while ($i <= $endyear)
     {
-        $legend[]=$i;
+        $legend[] = $i;
         $i++;
     }
     $px1->SetLegend($legend);
     $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0,$px1->GetFloorMinValue()));
+    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
     $px1->SetWidth($WIDTH);
     $px1->SetHeight($HEIGHT);
     $px1->SetYLabel($langs->trans("NbOfSendings"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
     $px1->SetPrecisionY(0);
-    $px1->mode='depth';
+    $px1->mode = 'depth';
     $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
-    $px1->draw($filenamenb,$fileurlnb);
+    $px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -203,24 +203,24 @@ 
 
 // Show array
 $data = $stats->getAllByYear();
-$arrayyears=array();
-foreach($data as $val) {
-	if (! empty($val['year'])) {
-		$arrayyears[$val['year']]=$val['year'];
+$arrayyears = array();
+foreach ($data as $val) {
+	if (!empty($val['year'])) {
+		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
-$h=0;
+$h = 0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/expedition/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT.'/expedition/stats/index.php?mode='.$mode;
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
 
-$type='shipment_stats';
+$type = 'shipment_stats';
 
-complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
 dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
@@ -238,9 +238,9 @@ 
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	if ($mode == 'customer') $filter='s.client in (1,2,3)';
-	if ($mode == 'supplier') $filter='s.fournisseur = 1';
-	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+	if ($mode == 'customer') $filter = 's.client in (1,2,3)';
+	if ($mode == 'supplier') $filter = 's.fournisseur = 1';
+	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
 	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
@@ -248,10 +248,10 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
 	arsort($arrayyears);
-	print $form->selectarray('year',$arrayyears,$year,0);
+	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
 	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
 	print '</table>';
@@ -269,11 +269,11 @@ 
 print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
-$oldyear=0;
+$oldyear = 0;
 foreach ($data as $val)
 {
 	$year = $val['year'];
-	while (! empty($year) && $oldyear > $year+1)
+	while (!empty($year) && $oldyear > $year + 1)
 	{ // If we have empty year
 		$oldyear--;
 
@@ -296,7 +296,7 @@ 
 	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
 	print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';*/
 	print '</tr>';
-	$oldyear=$year;
+	$oldyear = $year;
 }
 
 print '</table>';

dolibarr/htdocs/societe/class/societe.class.php

Indentation +3920 added lines, -3920 removed lines

@@ -42,313 +42,313 @@ 
  */
 class Societe extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='societe';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'societe';
-
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element='fk_soc';
-
-	public $fieldsforcombobox='nom,name_alias';
-	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
-	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
-	public $picto = 'company';
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
-	 * @var integer
-	 */
-	public $restrictiononfksoc = 1;
-
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
-		'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
-		'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		'datec'			=>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
-		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
-		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
-		'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
-		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
-	);
-
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	/**
-	 * Thirdparty name
-	 * @var string
-	 * @deprecated Use $name instead
-	 * @see $name
-	 */
-	public $nom;
-
-	/**
-	 * @var string name
-	 */
-	public $name;
-
-	/**
-	 * Alias names (commercial, trademark or alias names)
-	 * @var string
-	 */
-	public $name_alias;
-
-	public $particulier;
-
-	/**
-	 * @var string Address
-	 */
-	public $address;
-
-	public $zip;
-	public $town;
-
-	/**
-	 * Thirdparty status : 0=activity ceased, 1= in activity
-	 * @var int
-	 */
-	public $status=1;
-
-	/**
-	 * Id of department
-	 * @var int
-	 */
-	public $state_id;
-	public $state_code;
-	public $state;
-
-	/**
-	 * Id of region
-	 * @var int
-	 */
-	public $region_code;
-	public $region;
-
-	/**
-	 * State code
-	 * @var string
-	 * @deprecated Use state_code instead
-	 * @see $state_code
-	 */
-	public $departement_code;
-
-	/**
-	 * @var string
-	 * @deprecated Use state instead
-	 * @see $state
-	 */
-	public $departement;
-
-	/**
-	 * @var string
-	 * @deprecated Use country instead
-	 * @see $country
-	 */
-	public $pays;
-
-	/**
-	 * Phone number
-	 * @var string
-	 */
-	public $phone;
-	/**
-	 * Fax number
-	 * @var string
-	 */
-	public $fax;
-	/**
-	 * Email
-	 * @var string
-	 */
-	public $email;
-	/**
-	 * Skype username
-	 * @var string
-	 */
-	public $skype;
-	/**
-	 * Twitter username
-	 * @var string
-	 */
-	public $twitter;
-	/**
-	 * Facebook username
-	 * @var string
-	 */
-	public $facebook;
-	/**
-	 * Webpage
-	 * @var string
-	 */
-	public $url;
-
-	//! barcode
-	/**
-	 * Barcode value
-	 * @var string
-	 */
-	public $barcode;
-
-	// 6 professional id (usage depends on country)
-
-	/**
-	 * Professional ID 1 (Ex: Siren in France)
-	 * @var string
-	 */
-	public $idprof1;
-
-	/**
-	 * Professional ID 2 (Ex: Siret in France)
-	 * @var string
-	 */
-	public $idprof2;
-
-	/**
-	 * Professional ID 3 (Ex: Ape in France)
-	 * @var string
-	 */
-	public $idprof3;
-
-	/**
-	 * Professional ID 4 (Ex: RCS in France)
-	 * @var string
-	 */
-	public $idprof4;
-
-	/**
-	 * Professional ID 5
-	 * @var string
-	 */
-	public $idprof5;
-
-	/**
-	 * Professional ID 6
-	 * @var string
-	 */
-	public $idprof6;
-
-	public $prefix_comm;
-
-	public $tva_assuj=1;
-	/**
-	 * Intracommunitary VAT ID
-	 * @var string
-	 */
-	public $tva_intra;
-
-	// Local taxes
-	public $localtax1_assuj;
-	public $localtax1_value;
-	public $localtax2_assuj;
-	public $localtax2_value;
-
-	public $managers;
-	public $capital;
-	public $typent_id=0;
-	public $typent_code;
-	public $effectif;
-	public $effectif_id=0;
-	public $forme_juridique_code;
-	public $forme_juridique=0;
-
-	public $remise_percent;
-	public $remise_supplier_percent;
-	public $mode_reglement_supplier_id;
-	public $cond_reglement_supplier_id;
-
-	/**
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='societe';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'societe';
+
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element='fk_soc';
+
+    public $fieldsforcombobox='nom,name_alias';
+    protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
+    protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+    public $picto = 'company';
+
+    /**
+     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     * @var int
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+     * @var integer
+     */
+    public $restrictiononfksoc = 1;
+
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
+        'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+        'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+        'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
+        'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
+        'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
+        'datec'			=>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
+        'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+        //'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
+        'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
+        'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+        //'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
+        'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
+    );
+
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    /**
+     * Thirdparty name
+     * @var string
+     * @deprecated Use $name instead
+     * @see $name
+     */
+    public $nom;
+
+    /**
+     * @var string name
+     */
+    public $name;
+
+    /**
+     * Alias names (commercial, trademark or alias names)
+     * @var string
+     */
+    public $name_alias;
+
+    public $particulier;
+
+    /**
+     * @var string Address
+     */
+    public $address;
+
+    public $zip;
+    public $town;
+
+    /**
+     * Thirdparty status : 0=activity ceased, 1= in activity
+     * @var int
+     */
+    public $status=1;
+
+    /**
+     * Id of department
+     * @var int
+     */
+    public $state_id;
+    public $state_code;
+    public $state;
+
+    /**
+     * Id of region
+     * @var int
+     */
+    public $region_code;
+    public $region;
+
+    /**
+     * State code
+     * @var string
+     * @deprecated Use state_code instead
+     * @see $state_code
+     */
+    public $departement_code;
+
+    /**
+     * @var string
+     * @deprecated Use state instead
+     * @see $state
+     */
+    public $departement;
+
+    /**
+     * @var string
+     * @deprecated Use country instead
+     * @see $country
+     */
+    public $pays;
+
+    /**
+     * Phone number
+     * @var string
+     */
+    public $phone;
+    /**
+     * Fax number
+     * @var string
+     */
+    public $fax;
+    /**
+     * Email
+     * @var string
+     */
+    public $email;
+    /**
+     * Skype username
+     * @var string
+     */
+    public $skype;
+    /**
+     * Twitter username
+     * @var string
+     */
+    public $twitter;
+    /**
+     * Facebook username
+     * @var string
+     */
+    public $facebook;
+    /**
+     * Webpage
+     * @var string
+     */
+    public $url;
+
+    //! barcode
+    /**
+     * Barcode value
+     * @var string
+     */
+    public $barcode;
+
+    // 6 professional id (usage depends on country)
+
+    /**
+     * Professional ID 1 (Ex: Siren in France)
+     * @var string
+     */
+    public $idprof1;
+
+    /**
+     * Professional ID 2 (Ex: Siret in France)
+     * @var string
+     */
+    public $idprof2;
+
+    /**
+     * Professional ID 3 (Ex: Ape in France)
+     * @var string
+     */
+    public $idprof3;
+
+    /**
+     * Professional ID 4 (Ex: RCS in France)
+     * @var string
+     */
+    public $idprof4;
+
+    /**
+     * Professional ID 5
+     * @var string
+     */
+    public $idprof5;
+
+    /**
+     * Professional ID 6
+     * @var string
+     */
+    public $idprof6;
+
+    public $prefix_comm;
+
+    public $tva_assuj=1;
+    /**
+     * Intracommunitary VAT ID
+     * @var string
+     */
+    public $tva_intra;
+
+    // Local taxes
+    public $localtax1_assuj;
+    public $localtax1_value;
+    public $localtax2_assuj;
+    public $localtax2_value;
+
+    public $managers;
+    public $capital;
+    public $typent_id=0;
+    public $typent_code;
+    public $effectif;
+    public $effectif_id=0;
+    public $forme_juridique_code;
+    public $forme_juridique=0;
+
+    public $remise_percent;
+    public $remise_supplier_percent;
+    public $mode_reglement_supplier_id;
+    public $cond_reglement_supplier_id;
+
+    /**
      * @var int ID
      */
-	public $fk_prospectlevel;
-
-	public $name_bis;
-
-	//Log data
-
-	/**
-	 * Date of last update
-	 * @var string
-	 */
-	public $date_modification;
-	/**
-	 * User that made last update
-	 * @var string
-	 */
-	public $user_modification;
-	/**
-	 * Date of creation
-	 * @var string
-	 */
-	public $date_creation;
-	/**
-	 * User that created the thirdparty
-	 * @var User
-	 */
-	public $user_creation;
-
-
-	public $specimen;
-
-	/**
-	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
-	 * @var int
-	 */
-	public $client=0;
-	/**
-	 * 0=no prospect, 1=prospect
-	 * @var int
-	 */
-	public $prospect=0;
-	/**
-	 * 0=no supplier, 1=supplier
-	 * @var int
-	 */
-	public $fournisseur;
-
-	/**
-	 * Client code. E.g: CU2014-003
-	 * @var string
-	 */
-	public $code_client;
-
-	/**
-	 * Supplier code. E.g: SU2014-003
-	 * @var string
-	 */
-	public $code_fournisseur;
-
-	/**
-	 * Accounting code for client
-	 * @var string
-	 */
-	public $code_compta;
+    public $fk_prospectlevel;
+
+    public $name_bis;
+
+    //Log data
+
+    /**
+     * Date of last update
+     * @var string
+     */
+    public $date_modification;
+    /**
+     * User that made last update
+     * @var string
+     */
+    public $user_modification;
+    /**
+     * Date of creation
+     * @var string
+     */
+    public $date_creation;
+    /**
+     * User that created the thirdparty
+     * @var User
+     */
+    public $user_creation;
+
+
+    public $specimen;
+
+    /**
+     * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
+     * @var int
+     */
+    public $client=0;
+    /**
+     * 0=no prospect, 1=prospect
+     * @var int
+     */
+    public $prospect=0;
+    /**
+     * 0=no supplier, 1=supplier
+     * @var int
+     */
+    public $fournisseur;
+
+    /**
+     * Client code. E.g: CU2014-003
+     * @var string
+     */
+    public $code_client;
+
+    /**
+     * Supplier code. E.g: SU2014-003
+     * @var string
+     */
+    public $code_fournisseur;
+
+    /**
+     * Accounting code for client
+     * @var string
+     */
+    public $code_compta;
 
     /**
      * Accounting code for client
@@ -356,3795 +356,3795 @@ 
      */
     public $code_compta_client;
 
-	/**
-	 * Accounting code for suppliers
-	 * @var string
-	 */
-	public $code_compta_fournisseur;
-
-	/**
-	 * @var string
-	 * @deprecated Note is split in public and private notes
-	 * @see $note_public, $note_private
-	 */
-	public $note;
-
-	/**
-	 * Private note
-	 * @var string
-	 */
-	public $note_private;
-
-	/**
-	 * Public note
-	 * @var string
-	 */
-	public $note_public;
-
-	//! code statut prospect
-	public $stcomm_id;
-	public $statut_commercial;
-
-	/**
-	 * Assigned price level
-	 * @var int
-	 */
-	public $price_level;
-	public $outstanding_limit;
-
-	/**
-	 * Min order amounts
-	 */
-	public $order_min_amount;
-	public $supplier_order_min_amount;
-
-	/**
-	 * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
-	 * @var int
-	 */
-	public $commercial_id;
-	/**
-	 * Id of parent thirdparty (if one)
-	 * @var int
-	 */
-	public $parent;
-	/**
-	 * Default language code of thirdparty (en_US, ...)
-	 * @var string
-	 */
-	public $default_lang;
-
-	/**
-	 * @var string Ref
-	 */
-	public $ref;
-
-	public $ref_int;
-	/**
-	 * External user reference.
-	 * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
-	 * build.
-	 * @var string
-	 */
-	public $ref_ext;
-
-	/**
-	 * Import key.
-	 * Set when the thirdparty has been created through an import process. This is to relate those created thirdparties
-	 * to an import process
-	 * @var string
-	 */
-	public $import_key;
-
-	/**
-	 * Supplier WebServices URL
-	 * @var string
-	 */
-	public $webservices_url;
-
-	/**
-	 * Supplier WebServices Key
-	 * @var string
-	 */
-	public $webservices_key;
-
-	public $logo;
-	public $logo_small;
-	public $logo_mini;
-
-	public $array_options;
-
-	// Incoterms
-	/**
+    /**
+     * Accounting code for suppliers
+     * @var string
+     */
+    public $code_compta_fournisseur;
+
+    /**
+     * @var string
+     * @deprecated Note is split in public and private notes
+     * @see $note_public, $note_private
+     */
+    public $note;
+
+    /**
+     * Private note
+     * @var string
+     */
+    public $note_private;
+
+    /**
+     * Public note
+     * @var string
+     */
+    public $note_public;
+
+    //! code statut prospect
+    public $stcomm_id;
+    public $statut_commercial;
+
+    /**
+     * Assigned price level
+     * @var int
+     */
+    public $price_level;
+    public $outstanding_limit;
+
+    /**
+     * Min order amounts
+     */
+    public $order_min_amount;
+    public $supplier_order_min_amount;
+
+    /**
+     * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
+     * @var int
+     */
+    public $commercial_id;
+    /**
+     * Id of parent thirdparty (if one)
+     * @var int
+     */
+    public $parent;
+    /**
+     * Default language code of thirdparty (en_US, ...)
+     * @var string
+     */
+    public $default_lang;
+
+    /**
+     * @var string Ref
+     */
+    public $ref;
+
+    public $ref_int;
+    /**
+     * External user reference.
+     * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
+     * build.
+     * @var string
+     */
+    public $ref_ext;
+
+    /**
+     * Import key.
+     * Set when the thirdparty has been created through an import process. This is to relate those created thirdparties
+     * to an import process
+     * @var string
+     */
+    public $import_key;
+
+    /**
+     * Supplier WebServices URL
+     * @var string
+     */
+    public $webservices_url;
+
+    /**
+     * Supplier WebServices Key
+     * @var string
+     */
+    public $webservices_key;
+
+    public $logo;
+    public $logo_small;
+    public $logo_mini;
+
+    public $array_options;
+
+    // Incoterms
+    /**
      * @var int ID
      */
-	public $fk_incoterms;
+    public $fk_incoterms;
 
-	public $location_incoterms;
-	public $libelle_incoterms;  //Used into tooltip
+    public $location_incoterms;
+    public $libelle_incoterms;  //Used into tooltip
 
-	// Multicurrency
-	/**
+    // Multicurrency
+    /**
      * @var int ID
      */
-	public $fk_multicurrency;
-
-	public $multicurrency_code;
-
-
-	// END MODULEBUILDER PROPERTIES
-
-
-	/**
-	 *    Constructor
-	 *
-	 *    @param	DoliDB		$db		Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		$this->client = 0;
-		$this->prospect = 0;
-		$this->fournisseur = 0;
-		$this->typent_id  = 0;
-		$this->effectif_id  = 0;
-		$this->forme_juridique_code  = 0;
-		$this->tva_assuj = 1;
-		$this->status = 1;
-	}
-
-
-	/**
-	 *    Create third party in database.
-	 *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
-	 *
-	 *    @param	User	$user       Object of user that ask creation
-	 *    @return   int         		>= 0 if OK, < 0 if KO
-	 */
-	function create(User $user)
-	{
-		global $langs,$conf,$mysoc;
-
-		$error=0;
-
-		// Clean parameters
-		if (empty($this->status)) $this->status=0;
-		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
-		$this->import_key = trim($this->import_key);
-
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
-			$this->multicurrency_code = '';
-			$this->fk_multicurrency = 0;
-		}
-
-		dol_syslog(get_class($this)."::create ".$this->name);
-
-		$now=dol_now();
-
-		$this->db->begin();
-
-		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
-
-		// Check more parameters (including mandatory setup
-		// If error, this->errors[] is filled
-		$result = $this->verify();
-
-		if ($result >= 0)
-		{
-			$this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
-
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-			$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
-			$sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-			$sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-			$sql.= ", ".$this->status;
-			$sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-			$sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-			$sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-			$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-			$sql.= ", ".(int) $this->fk_multicurrency;
-			$sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
-
-			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$result=$this->db->query($sql);
-			if ($result)
-			{
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
-
-				$ret = $this->update($this->id,$user,0,1,1,'add');
-
-				// Ajout du commercial affecte
-				if ($this->commercial_id != '' && $this->commercial_id != -1)
-				{
-					$this->add_commercial($user, $this->commercial_id);
-				}
-				// si un commercial cree un client il lui est affecte automatiquement
-				elseif (empty($user->rights->societe->client->voir))
-				{
-					$this->add_commercial($user, $user->id);
-				}
-
-				if ($ret >= 0)
-				{
-					// Call trigger
-					$result=$this->call_trigger('COMPANY_CREATE',$user);
-					if ($result < 0) $error++;
-					// End call triggers
-				}
-				else $error++;
-
-				if (! $error)
-				{
-					dol_syslog(get_class($this)."::Create success id=".$this->id);
-					$this->db->commit();
-					return $this->id;
-				}
-				else
-				{
-					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
-					$this->db->rollback();
-					return -4;
-				}
-			}
-			else
-			{
-				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-					$result=-1;
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$result=-2;
-				}
-				$this->db->rollback();
-				return $result;
-			}
-		}
-		else
-		{
-			$this->db->rollback();
-			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
-			return -3;
-		}
-	}
+    public $fk_multicurrency;
+
+    public $multicurrency_code;
+
+
+    // END MODULEBUILDER PROPERTIES
+
+
+    /**
+     *    Constructor
+     *
+     *    @param	DoliDB		$db		Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+
+        $this->client = 0;
+        $this->prospect = 0;
+        $this->fournisseur = 0;
+        $this->typent_id  = 0;
+        $this->effectif_id  = 0;
+        $this->forme_juridique_code  = 0;
+        $this->tva_assuj = 1;
+        $this->status = 1;
+    }
+
+
+    /**
+     *    Create third party in database.
+     *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
+     *
+     *    @param	User	$user       Object of user that ask creation
+     *    @return   int         		>= 0 if OK, < 0 if KO
+     */
+    function create(User $user)
+    {
+        global $langs,$conf,$mysoc;
+
+        $error=0;
+
+        // Clean parameters
+        if (empty($this->status)) $this->status=0;
+        $this->name=$this->name?trim($this->name):trim($this->nom);
+        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+        $this->nom=$this->name; // For backward compatibility
+        if (empty($this->client))      $this->client=0;
+        if (empty($this->fournisseur)) $this->fournisseur=0;
+        $this->import_key = trim($this->import_key);
+
+        if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (empty($this->fk_multicurrency))
+        {
+            $this->multicurrency_code = '';
+            $this->fk_multicurrency = 0;
+        }
+
+        dol_syslog(get_class($this)."::create ".$this->name);
+
+        $now=dol_now();
+
+        $this->db->begin();
+
+        // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
+        if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
+        if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+
+        // Check more parameters (including mandatory setup
+        // If error, this->errors[] is filled
+        $result = $this->verify();
+
+        if ($result >= 0)
+        {
+            $this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
+            $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+            $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
+            $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
+            $sql.= ", ".$this->status;
+            $sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
+            $sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
+            $sql.= ", 0";
+            $sql.= ", ".(int) $this->fk_incoterms;
+            $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+            $sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
+            $sql.= ", ".(int) $this->fk_multicurrency;
+            $sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
+
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            $result=$this->db->query($sql);
+            if ($result)
+            {
+                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
+
+                $ret = $this->update($this->id,$user,0,1,1,'add');
+
+                // Ajout du commercial affecte
+                if ($this->commercial_id != '' && $this->commercial_id != -1)
+                {
+                    $this->add_commercial($user, $this->commercial_id);
+                }
+                // si un commercial cree un client il lui est affecte automatiquement
+                elseif (empty($user->rights->societe->client->voir))
+                {
+                    $this->add_commercial($user, $user->id);
+                }
+
+                if ($ret >= 0)
+                {
+                    // Call trigger
+                    $result=$this->call_trigger('COMPANY_CREATE',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
+                }
+                else $error++;
+
+                if (! $error)
+                {
+                    dol_syslog(get_class($this)."::Create success id=".$this->id);
+                    $this->db->commit();
+                    return $this->id;
+                }
+                else
+                {
+                    dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+                    $this->db->rollback();
+                    return -4;
+                }
+            }
+            else
+            {
+                if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
+                    $result=-1;
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $result=-2;
+                }
+                $this->db->rollback();
+                return $result;
+            }
+        }
+        else
+        {
+            $this->db->rollback();
+            dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+            return -3;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a contact/address from thirdparty
-	 *
-	 * @param 	User	$user		Object user
-	 * @return 	int					<0 if KO, >0 if OK
-	 */
-	function create_individual(User $user)
-	{
+    /**
+     * Create a contact/address from thirdparty
+     *
+     * @param 	User	$user		Object user
+     * @return 	int					<0 if KO, >0 if OK
+     */
+    function create_individual(User $user)
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		$contact=new Contact($this->db);
-
-		$contact->name              = $this->name_bis;
-		$contact->firstname         = $this->firstname;
-		$contact->civility_id       = $this->civility_id;
-		$contact->socid             = $this->id;	// fk_soc
-		$contact->statut            = 1;
-		$contact->priv              = 0;
-		$contact->country_id        = $this->country_id;
-		$contact->state_id          = $this->state_id;
-		$contact->address           = $this->address;
-		$contact->email             = $this->email;
-		$contact->zip               = $this->zip;
-		$contact->town              = $this->town;
-		$contact->phone_pro         = $this->phone;
-
-		$result = $contact->create($user);
-		if ($result < 0)
-		{
-			$this->error = $contact->error;
-			$this->errors = $contact->errors;
-			dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
-		}
-
-		return $result;
-	}
-
-	/**
-	 *    Check properties of third party are ok (like name, third party codes, ...)
-	 *    Used before an add or update.
-	 *
-	 *    @return     int		0 if OK, <0 if KO
-	 */
-	function verify()
-	{
-		global $conf, $langs, $mysoc;
-
-		$error = 0;
-		$this->errors=array();
-
-		$result = 0;
-		$this->name	= trim($this->name);
-		$this->nom=$this->name; // For backward compatibility
-
-		if (! $this->name)
-		{
-			$this->errors[] = 'ErrorBadThirdPartyName';
-			$result = -2;
-		}
-
-		if ($this->client)
-		{
-			$rescode = $this->check_codeclient();
-			if ($rescode <> 0)
-			{
-				if ($rescode == -1)
-				{
-					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
-				{
-					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
-				{
-					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
-				{
-					$this->errors[] = 'ErrorPrefixRequired';
-				}
-				$result = -3;
-			}
-		}
-
-		if ($this->fournisseur)
-		{
-			$rescode = $this->check_codefournisseur();
-			if ($rescode <> 0)
-			{
-				if ($rescode == -1)
-				{
-					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
-				{
-					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
-				{
-					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
-				{
-					$this->errors[] = 'ErrorprefixRequired';
-				}
-				$result = -3;
-			}
-		}
-
-		// Check for duplicate or mandatory fields defined into setup
-		$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-		foreach($array_to_check as $key)
-		{
-			$keymin=strtolower($key);
-			$i=(int) preg_replace('/[^0-9]/','',$key);
-			$vallabel=$this->$keymin;
-
-			if ($i > 0)
-			{
-				if ($this->isACompany())
-				{
-					// Check for unicity
-					if ($vallabel && $this->id_prof_verifiable($i))
-					{
-						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-						{
-							$langs->load("errors");
-							$error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
-						}
-					}
-
-					// Check for mandatory prof id (but only if country is other than ours)
-					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
-					{
-						$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-						if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
-						{
-							$langs->load("errors");
-							$error++;
-							$this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
-						}
-					}
-				}
-			}
-			else
-			{
-				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
-				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-				if ($key == 'EMAIL')
-				{
-					// Check for unicity
-					if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
-					{
-						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-						{
-							$langs->load("errors");
-							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
-						}
-					}
-
-					// Check for mandatory
-					if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
-					{
-						$langs->load("errors");
-						$error++;
-						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
-					}
-				}
-			}
-		}
-
-		if ($error) $result = -4;
-
-		return $result;
-	}
-
-	/**
-	 *      Update parameters of third party
-	 *
-	 *      @param	int		$id              			Id of company (deprecated, use 0 here and call update on an object loaded by a fetch)
-	 *      @param  User	$user            			Utilisateur qui demande la mise a jour
-	 *      @param  int		$call_trigger    			0=no, 1=yes
-	 *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
-	 *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
-	 *		@param	string	$action						'add' or 'update' or 'merge'
-	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
-	 *      @return int  			           			<0 if KO, >=0 if OK
-	 */
-	function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
-	{
-		global $langs,$conf,$hookmanager;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-		if (empty($id)) $id = $this->id;
-
-		$error=0;
-
-		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
-
-		$now=dol_now();
-
-		// Clean parameters
-		$this->id			= $id;
-		$this->entity		= ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
-		$this->name			= $this->name?trim($this->name):trim($this->nom);
-		$this->nom			= $this->name;	// For backward compatibility
-		$this->name_alias	= trim($this->name_alias);
-		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address?trim($this->address):trim($this->address);
-		$this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-		$this->town			= $this->town?trim($this->town):trim($this->town);
-		$this->state_id		= trim($this->state_id);
-		$this->country_id	= ($this->country_id > 0)?$this->country_id:0;
-		$this->phone		= trim($this->phone);
-		$this->phone		= preg_replace("/\s/","",$this->phone);
-		$this->phone		= preg_replace("/\./","",$this->phone);
-		$this->fax			= trim($this->fax);
-		$this->fax			= preg_replace("/\s/","",$this->fax);
-		$this->fax			= preg_replace("/\./","",$this->fax);
-		$this->email		= trim($this->email);
-		$this->skype		= trim($this->skype);
-		$this->twitter		= trim($this->twitter);
-		$this->facebook		= trim($this->facebook);
-		$this->url			= $this->url?clean_url($this->url,0):'';
-		$this->note_private = trim($this->note_private);
-		$this->note_public  = trim($this->note_public);
-		$this->idprof1		= trim($this->idprof1);
-		$this->idprof2		= trim($this->idprof2);
-		$this->idprof3		= trim($this->idprof3);
-		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-		$this->prefix_comm	= trim($this->prefix_comm);
-		$this->outstanding_limit = price2num($this->outstanding_limit);
-		$this->order_min_amount = price2num($this->order_min_amount);
-		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
-
-		$this->tva_assuj	= trim($this->tva_assuj);
-		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-		if (empty($this->status)) $this->status = 0;
-
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
-			$this->multicurrency_code = '';
-			$this->fk_multicurrency = 0;
-		}
-
-		// Local taxes
-		$this->localtax1_assuj=trim($this->localtax1_assuj);
-		$this->localtax2_assuj=trim($this->localtax2_assuj);
-
-		$this->localtax1_value=trim($this->localtax1_value);
-		$this->localtax2_value=trim($this->localtax2_value);
-
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
-
-		$this->effectif_id=trim($this->effectif_id);
-		$this->forme_juridique_code=trim($this->forme_juridique_code);
-
-		//Gencod
-		$this->barcode=trim($this->barcode);
-
-		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
-
-		$this->code_compta=trim($this->code_compta);
-		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
-
-		// Check parameters. More tests are done later in the ->verify()
-		if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
-		{
-			$langs->load("errors");
-			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
-			return -1;
-		}
-
-		$customer=false;
-		if (! empty($allowmodcodeclient) && ! empty($this->client))
-		{
-			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta))
-			{
-				$ret=$this->get_codecompta('customer');
-				if ($ret < 0) return -1;
-			}
-
-			$customer=true;
-		}
-
-		$supplier=false;
-		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
-		{
-			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta_fournisseur))
-			{
-				$ret=$this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
-			}
-
-			$supplier=true;
-		}
-
-		//Web services
-		$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
-		$this->webservices_key = trim($this->webservices_key);
-
-		//Incoterms
-		$this->fk_incoterms = (int) $this->fk_incoterms;
-		$this->location_incoterms = trim($this->location_incoterms);
-
-		$this->db->begin();
-
-		// Check name is required and codes are ok or unique.
-		// If error, this->errors[] is filled
-		$result = 0;
-		if ($action != 'add' && $action != 'merge')
-		{
-			// We don't check when update called during a create because verify was already done.
-			// For a merge, we suppose source data is clean and a customer code of a deleted thirdparty must be accepted into a target thirdparty with empty code without duplicate error
-			$result = $this->verify();
-
-			// If there is only one error and error is ErrorBadCustomerCodeSyntax and we don't change customer code, we allow the update
-			// So we can update record that were using and old numbering rule.
-			if (is_array($this->errors))
-			{
-				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
-				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
-				}
-				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
-				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
-				}
-				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
-				{
-					$result = 0;
-				}
-			}
-		}
-
-		if ($result >= 0)
-		{
-			dol_syslog(get_class($this)."::update verify ok or not done");
-
-			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-			$sql .= "entity = " . $this->db->escape($this->entity);
-			$sql .= ",nom = '" . $this->db->escape($this->name) ."'"; // Required
-			$sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-			$sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-			$sql .= ",address = '" . $this->db->escape($this->address) ."'";
-
-			$sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-			$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
-
-			$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-			$sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
-
-			$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-			$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-			$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-			$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-			$sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
-			$sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
-			$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
-
-			$sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
-
-			$sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-			$sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-
-			$sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-			$sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-			$sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-			$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-			$sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-			$sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
-
-			$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-			$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-			$sql .= ",status = " .$this->status;
-
-			// Local taxes
-			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-			if($this->localtax1_assuj==1)
-			{
-				if($this->localtax1_value!='')
-				{
-					$sql .=",localtax1_value =".$this->localtax1_value;
-				}
-				else $sql .=",localtax1_value =0.000";
-			}
-			else $sql .=",localtax1_value =0.000";
-
-			if($this->localtax2_assuj==1)
-			{
-				if($this->localtax2_value!='')
-				{
-					$sql .=",localtax2_value =".$this->localtax2_value;
-				}
-				else $sql .=",localtax2_value =0.000";
-			}
-			else $sql .=",localtax2_value =0.000";
-
-			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
-
-			$sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
-
-			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
-			if (isset($this->stcomm_id))
-			{
-				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
-			}
-			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
-
-			$sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
-
-			$sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-			$sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-			$sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-			$sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-			$sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
-
-			$sql .= ",client = " . (! empty($this->client)?$this->client:0);
-			$sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
-			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
-			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
-
-			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-			$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
-
-			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
-
-			if ($customer)
-			{
-				$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-				$sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
-			}
-
-			if ($supplier)
-			{
-				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
-			}
-			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
-			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
-			$sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
-			$sql .= " WHERE rowid = " . (int) $id;
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				if (is_object($this->oldcopy))	// If we have information on old values
-				{
-					if ($this->oldcopy->country_id != $this->country_id)
-					{
-						unset($this->country_code);
-						unset($this->country);
-					}
-					if ($this->oldcopy->state_id != $this->state_id)
-					{
-						unset($this->state_code);
-						unset($this->state);
-					}
-				}
-				else
-				{
-					unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
-					unset($this->country);
-					unset($this->state_code);
-					unset($this->state);
-				}
-
-				$nbrowsaffected = $this->db->affected_rows($resql);
-
-				if (! $error && $nbrowsaffected)
-				{
-					// Update information on linked member if it is an update
-					if (! $nosyncmember && ! empty($conf->adherent->enabled))
-					{
-						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-
-						dol_syslog(get_class($this)."::update update linked member");
-
-						$lmember=new Adherent($this->db);
-						$result=$lmember->fetch(0, 0, $this->id);
-
-						if ($result > 0)
-						{
-							$lmember->societe=$this->name;
-							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
-							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-							$lmember->address=$this->address;
-							$lmember->email=$this->email;
-							$lmember->skype=$this->skype;
-							$lmember->twitter=$this->twitter;
-							$lmember->facebook=$this->facebook;
-							$lmember->phone=$this->phone;
-
-							$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
-							if ($result < 0)
-							{
-								$this->error=$lmember->error;
-								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
-								$error++;
-							}
-						}
-						elseif ($result < 0)
-						{
-							$this->error=$lmember->error;
-							$error++;
-						}
-					}
-				}
-
-				$action='update';
-
-				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
-				}
-
-				if (! $error && $call_trigger)
-				{
-					// Call trigger
-					$result=$this->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0) $error++;
-					// End call triggers
-				}
-
-				if (! $error)
-				{
-					dol_syslog(get_class($this)."::Update success");
-					$this->db->commit();
-					return 1;
-				}
-				else
-				{
-					$this->db->rollback();
-					return -1;
-				}
-			}
-			else
-			{
-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
-					// Doublon
-					$this->error = $langs->trans("ErrorDuplicateField");
-					$result = -1;
-				}
-				else
-				{
-					$this->error = $this->db->lasterror();
-					$result = -2;
-				}
-				$this->db->rollback();
-				return $result;
-			}
-		}
-		else
-	   {
-			$this->db->rollback();
-			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
-			return -3;
-		}
-	}
-
-	/**
-	 *    Load a third party from database into memory
-	 *
-	 *    @param	int		$rowid			Id of third party to load
-	 *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
-	 *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
-	 *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
-	 *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
-	 *    @param    string	$email   		Email of third party (Warning, this can return several records)
-	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
-	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
-	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
-	{
-		global $langs;
-		global $conf;
-
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
-
-		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
-		$sql .= ', s.status';
-		$sql .= ', s.price_level';
-		$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
-		$sql .= ', s.phone, s.fax, s.email, s.skype, s.twitter, s.facebook, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
-		$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
-		$sql .= ', s.capital, s.tva_intra';
-		$sql .= ', s.fk_typent as typent_id';
-		$sql .= ', s.fk_effectif as effectif_id';
-		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
-		$sql .= ', s.webservices_url, s.webservices_key';
-		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
-		$sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
-		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
-		$sql .= ', s.fk_shipping_method';
-		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
-		$sql .= ', s.order_min_amount, s.supplier_order_min_amount';
-		$sql .= ', s.fk_multicurrency, s.multicurrency_code';
-		$sql .= ', fj.libelle as forme_juridique';
-		$sql .= ', e.libelle as effectif';
-		$sql .= ', c.code as country_code, c.label as country';
-		$sql .= ', d.code_departement as state_code, d.nom as state';
-		$sql .= ', st.libelle as stcomm';
-		$sql .= ', te.code as typent_code';
-		$sql .= ', i.libelle as libelle_incoterms';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
-
-		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			if ($num > 1)
-			{
-				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
-				dol_syslog($this->error, LOG_ERR);
-				$result = -2;
-			}
-			elseif ($num)   // $num = 1
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id           = $obj->rowid;
-				$this->entity       = $obj->entity;
-				$this->canvas		= $obj->canvas;
-
-				$this->ref          = $obj->rowid;
-				$this->name 		= $obj->name;
-				$this->nom          = $obj->name;		// deprecated
-				$this->name_alias = $obj->name_alias;
-				$this->ref_ext      = $obj->ref_ext;
-				$this->ref_int      = $obj->ref_int;
-
-				$this->date_creation     = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
-				$this->user_creation     = $obj->fk_user_creat;
-				$this->user_modification = $obj->fk_user_modif;
-
-				$this->address 		= $obj->address;
-				$this->zip 			= $obj->zip;
-				$this->town 		= $obj->town;
-
-				$this->country_id   = $obj->country_id;
-				$this->country_code = $obj->country_id?$obj->country_code:'';
-				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
-
-				$this->state_id     = $obj->fk_departement;
-				$this->state_code   = $obj->state_code;
-				$this->state        = ($obj->state!='-'?$obj->state:'');
-
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-				$this->statut_commercial = $libelle;    // libelle statut commercial
-
-				$this->email = $obj->email;
-				$this->skype = $obj->skype;
-				$this->twitter = $obj->twitter;
-				$this->facebook = $obj->facebook;
-				$this->url = $obj->url;
-				$this->phone = $obj->phone;
-				$this->fax = $obj->fax;
-
-				$this->parent    = $obj->parent;
-
-				$this->idprof1		= $obj->idprof1;
-				$this->idprof2		= $obj->idprof2;
-				$this->idprof3		= $obj->idprof3;
-				$this->idprof4		= $obj->idprof4;
-				$this->idprof5		= $obj->idprof5;
-				$this->idprof6		= $obj->idprof6;
-
-				$this->capital   = $obj->capital;
-
-				$this->code_client = $obj->code_client;
-				$this->code_fournisseur = $obj->code_fournisseur;
-
-				$this->code_compta = $obj->code_compta;
-				$this->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-				$this->barcode = $obj->barcode;
-
-				$this->tva_assuj      = $obj->tva_assuj;
-				$this->tva_intra      = $obj->tva_intra;
-				$this->status = $obj->status;
-
-				// Local Taxes
-				$this->localtax1_assuj      = $obj->localtax1_assuj;
-				$this->localtax2_assuj      = $obj->localtax2_assuj;
-
-				$this->localtax1_value		= $obj->localtax1_value;
-				$this->localtax2_value		= $obj->localtax2_value;
-
-				$this->typent_id      = $obj->typent_id;
-				$this->typent_code    = $obj->typent_code;
-
-				$this->effectif_id    = $obj->effectif_id;
-				$this->effectif       = $obj->effectif_id?$obj->effectif:'';
-
-				$this->forme_juridique_code= $obj->forme_juridique_code;
-				$this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
-
-				$this->fk_prospectlevel = $obj->fk_prospectlevel;
-
-				$this->prefix_comm = $obj->prefix_comm;
-
-				$this->remise_percent		= $obj->remise_client;
-				$this->remise_supplier_percent		= $obj->remise_supplier;
-				$this->mode_reglement_id 	= $obj->mode_reglement;
-				$this->cond_reglement_id 	= $obj->cond_reglement;
-				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
-				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
-
-				$this->client      = $obj->client;
-				$this->fournisseur = $obj->fournisseur;
-
-				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
-				$this->note_private = $obj->note_private;
-				$this->note_public = $obj->note_public;
-				$this->modelpdf = $obj->model_pdf;
-				$this->default_lang = $obj->default_lang;
-				$this->logo = $obj->logo;
-
-				$this->webservices_url = $obj->webservices_url;
-				$this->webservices_key = $obj->webservices_key;
-
-				$this->outstanding_limit		= $obj->outstanding_limit;
-				$this->order_min_amount			= $obj->order_min_amount;
-				$this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
-
-				// multiprix
-				$this->price_level = $obj->price_level;
-
-				$this->import_key = $obj->import_key;
-
-				//Incoterms
-				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;
-				$this->libelle_incoterms = $obj->libelle_incoterms;
-
-				// multicurrency
-				$this->fk_multicurrency = $obj->fk_multicurrency;
-				$this->multicurrency_code = $obj->multicurrency_code;
-
-				$result = 1;
-
-				// fetch optionals attributes and labels
-				$this->fetch_optionals();
-			}
-			else
-			{
-				$result = 0;
-			}
-
-			$this->db->free($resql);
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$result = -3;
-		}
-
-		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
-
-		return $result;
-	}
-
-	/**
-	 *    Delete a third party from database and all its dependencies (contacts, rib...)
-	 *
-	 *    @param	int		$id             Id of third party to delete
-	 *    @param    User    $fuser          User who ask to delete thirparty
-	 *    @param    int		$call_trigger   0=No, 1=yes
-	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
-	 */
-	function delete($id, User $fuser=null, $call_trigger=1)
-	{
-		global $langs, $conf, $user;
-
-		if (empty($fuser)) $fuser=$user;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$entity=isset($this->entity)?$this->entity:$conf->entity;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$error = 0;
-
-		// Test if child exists
-		$objectisused = $this->isObjectUsed($id);
-		if (empty($objectisused))
-		{
-			$this->db->begin();
-
-			// User is mandatory for trigger call
-			if (! $error && $call_trigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
-				if ($result < 0) $error++;
-				// End call triggers
-			}
-
-			if (! $error)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-				$static_cat = new Categorie($this->db);
-				$toute_categs = array();
-
-				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
-				if ($this->client || $this->prospect)
-				{
-					$toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
-				}
-				if ($this->fournisseur)
-				{
-					$toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
-				}
-
-				// Remove each "Categorie"
-				foreach ($toute_categs as $type => $categs_type)
-				{
-					foreach ($categs_type as $cat)
-					{
-						$cat->del_type($this, $type);
-					}
-				}
-			}
-
-			foreach ($this->childtablesoncascade as $tabletodelete)
-			{
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
-					{
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-					}
-				}
-			}
-
-			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-			{
-				$result=$this->deleteExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-					dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-				}
-			}
-
-			// Remove links to subsidiaries companies
-			if (! $error)
-			{
-				$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-				$sql.= " SET parent = NULL";
-				$sql.= " WHERE parent = " . $id;
-				if (! $this->db->query($sql))
-				{
-					$error++;
-					$this->errors[] = $this->db->lasterror();
-				}
-			}
-
-			// Remove third party
-			if (! $error)
-			{
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-				$sql.= " WHERE rowid = " . $id;
-				if (! $this->db->query($sql))
-				{
-					$error++;
-					$this->errors[] = $this->db->lasterror();
-				}
-			}
-
-			if (! $error)
-			{
-				$this->db->commit();
-
-				// Delete directory
-				if (! empty($conf->societe->multidir_output[$entity]))
-				{
-					$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
-					if (dol_is_dir($docdir))
-					{
-						dol_delete_dir_recursive($docdir);
-					}
-				}
-
-				return 1;
-			}
-			else
-			{
-				dol_syslog($this->error, LOG_ERR);
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
-		return 0;
-	}
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        $contact=new Contact($this->db);
+
+        $contact->name              = $this->name_bis;
+        $contact->firstname         = $this->firstname;
+        $contact->civility_id       = $this->civility_id;
+        $contact->socid             = $this->id;	// fk_soc
+        $contact->statut            = 1;
+        $contact->priv              = 0;
+        $contact->country_id        = $this->country_id;
+        $contact->state_id          = $this->state_id;
+        $contact->address           = $this->address;
+        $contact->email             = $this->email;
+        $contact->zip               = $this->zip;
+        $contact->town              = $this->town;
+        $contact->phone_pro         = $this->phone;
+
+        $result = $contact->create($user);
+        if ($result < 0)
+        {
+            $this->error = $contact->error;
+            $this->errors = $contact->errors;
+            dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+        }
+
+        return $result;
+    }
+
+    /**
+     *    Check properties of third party are ok (like name, third party codes, ...)
+     *    Used before an add or update.
+     *
+     *    @return     int		0 if OK, <0 if KO
+     */
+    function verify()
+    {
+        global $conf, $langs, $mysoc;
+
+        $error = 0;
+        $this->errors=array();
+
+        $result = 0;
+        $this->name	= trim($this->name);
+        $this->nom=$this->name; // For backward compatibility
+
+        if (! $this->name)
+        {
+            $this->errors[] = 'ErrorBadThirdPartyName';
+            $result = -2;
+        }
+
+        if ($this->client)
+        {
+            $rescode = $this->check_codeclient();
+            if ($rescode <> 0)
+            {
+                if ($rescode == -1)
+                {
+                    $this->errors[] = 'ErrorBadCustomerCodeSyntax';
+                }
+                elseif ($rescode == -2)
+                {
+                    $this->errors[] = 'ErrorCustomerCodeRequired';
+                }
+                elseif ($rescode == -3)
+                {
+                    $this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
+                }
+                elseif ($rescode == -4)
+                {
+                    $this->errors[] = 'ErrorPrefixRequired';
+                }
+                $result = -3;
+            }
+        }
+
+        if ($this->fournisseur)
+        {
+            $rescode = $this->check_codefournisseur();
+            if ($rescode <> 0)
+            {
+                if ($rescode == -1)
+                {
+                    $this->errors[] = 'ErrorBadSupplierCodeSyntax';
+                }
+                elseif ($rescode == -2)
+                {
+                    $this->errors[] = 'ErrorSupplierCodeRequired';
+                }
+                elseif ($rescode == -3)
+                {
+                    $this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
+                }
+                elseif ($rescode == -5)
+                {
+                    $this->errors[] = 'ErrorprefixRequired';
+                }
+                $result = -3;
+            }
+        }
+
+        // Check for duplicate or mandatory fields defined into setup
+        $array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
+        foreach($array_to_check as $key)
+        {
+            $keymin=strtolower($key);
+            $i=(int) preg_replace('/[^0-9]/','',$key);
+            $vallabel=$this->$keymin;
+
+            if ($i > 0)
+            {
+                if ($this->isACompany())
+                {
+                    // Check for unicity
+                    if ($vallabel && $this->id_prof_verifiable($i))
+                    {
+                        if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
+                        {
+                            $langs->load("errors");
+                            $error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                        }
+                    }
+
+                    // Check for mandatory prof id (but only if country is other than ours)
+                    if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
+                    {
+                        $idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
+                        if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+                        {
+                            $langs->load("errors");
+                            $error++;
+                            $this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                        }
+                    }
+                }
+            }
+            else
+            {
+                //var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
+                //var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
+                if ($key == 'EMAIL')
+                {
+                    // Check for unicity
+                    if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
+                    {
+                        if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
+                        {
+                            $langs->load("errors");
+                            $error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                        }
+                    }
+
+                    // Check for mandatory
+                    if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+                    {
+                        $langs->load("errors");
+                        $error++;
+                        $this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                    }
+                }
+            }
+        }
+
+        if ($error) $result = -4;
+
+        return $result;
+    }
+
+    /**
+     *      Update parameters of third party
+     *
+     *      @param	int		$id              			Id of company (deprecated, use 0 here and call update on an object loaded by a fetch)
+     *      @param  User	$user            			Utilisateur qui demande la mise a jour
+     *      @param  int		$call_trigger    			0=no, 1=yes
+     *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
+     *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
+     *		@param	string	$action						'add' or 'update' or 'merge'
+     *		@param	int		$nosyncmember				Do not synchronize info of linked member
+     *      @return int  			           			<0 if KO, >=0 if OK
+     */
+    function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+    {
+        global $langs,$conf,$hookmanager;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+        if (empty($id)) $id = $this->id;
+
+        $error=0;
+
+        dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
+
+        $now=dol_now();
+
+        // Clean parameters
+        $this->id			= $id;
+        $this->entity		= ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+        $this->name			= $this->name?trim($this->name):trim($this->nom);
+        $this->nom			= $this->name;	// For backward compatibility
+        $this->name_alias	= trim($this->name_alias);
+        $this->ref_ext		= trim($this->ref_ext);
+        $this->address		= $this->address?trim($this->address):trim($this->address);
+        $this->zip			= $this->zip?trim($this->zip):trim($this->zip);
+        $this->town			= $this->town?trim($this->town):trim($this->town);
+        $this->state_id		= trim($this->state_id);
+        $this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+        $this->phone		= trim($this->phone);
+        $this->phone		= preg_replace("/\s/","",$this->phone);
+        $this->phone		= preg_replace("/\./","",$this->phone);
+        $this->fax			= trim($this->fax);
+        $this->fax			= preg_replace("/\s/","",$this->fax);
+        $this->fax			= preg_replace("/\./","",$this->fax);
+        $this->email		= trim($this->email);
+        $this->skype		= trim($this->skype);
+        $this->twitter		= trim($this->twitter);
+        $this->facebook		= trim($this->facebook);
+        $this->url			= $this->url?clean_url($this->url,0):'';
+        $this->note_private = trim($this->note_private);
+        $this->note_public  = trim($this->note_public);
+        $this->idprof1		= trim($this->idprof1);
+        $this->idprof2		= trim($this->idprof2);
+        $this->idprof3		= trim($this->idprof3);
+        $this->idprof4		= trim($this->idprof4);
+        $this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
+        $this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
+        $this->prefix_comm	= trim($this->prefix_comm);
+        $this->outstanding_limit = price2num($this->outstanding_limit);
+        $this->order_min_amount = price2num($this->order_min_amount);
+        $this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
+
+        $this->tva_assuj	= trim($this->tva_assuj);
+        $this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+        if (empty($this->status)) $this->status = 0;
+
+        if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (empty($this->fk_multicurrency))
+        {
+            $this->multicurrency_code = '';
+            $this->fk_multicurrency = 0;
+        }
+
+        // Local taxes
+        $this->localtax1_assuj=trim($this->localtax1_assuj);
+        $this->localtax2_assuj=trim($this->localtax2_assuj);
+
+        $this->localtax1_value=trim($this->localtax1_value);
+        $this->localtax2_value=trim($this->localtax2_value);
+
+        if ($this->capital != '') $this->capital=price2num(trim($this->capital));
+        if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+
+        $this->effectif_id=trim($this->effectif_id);
+        $this->forme_juridique_code=trim($this->forme_juridique_code);
+
+        //Gencod
+        $this->barcode=trim($this->barcode);
+
+        // For automatic creation
+        if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
+        if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+
+        $this->code_compta=trim($this->code_compta);
+        $this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+
+        // Check parameters. More tests are done later in the ->verify()
+        if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+        {
+            $langs->load("errors");
+            $this->error = $langs->trans("BadValueForParameterClientOrSupplier");
+            return -1;
+        }
+
+        $customer=false;
+        if (! empty($allowmodcodeclient) && ! empty($this->client))
+        {
+            // Attention get_codecompta peut modifier le code suivant le module utilise
+            if (empty($this->code_compta))
+            {
+                $ret=$this->get_codecompta('customer');
+                if ($ret < 0) return -1;
+            }
+
+            $customer=true;
+        }
+
+        $supplier=false;
+        if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+        {
+            // Attention get_codecompta peut modifier le code suivant le module utilise
+            if (empty($this->code_compta_fournisseur))
+            {
+                $ret=$this->get_codecompta('supplier');
+                if ($ret < 0) return -1;
+            }
+
+            $supplier=true;
+        }
+
+        //Web services
+        $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+        $this->webservices_key = trim($this->webservices_key);
+
+        //Incoterms
+        $this->fk_incoterms = (int) $this->fk_incoterms;
+        $this->location_incoterms = trim($this->location_incoterms);
+
+        $this->db->begin();
+
+        // Check name is required and codes are ok or unique.
+        // If error, this->errors[] is filled
+        $result = 0;
+        if ($action != 'add' && $action != 'merge')
+        {
+            // We don't check when update called during a create because verify was already done.
+            // For a merge, we suppose source data is clean and a customer code of a deleted thirdparty must be accepted into a target thirdparty with empty code without duplicate error
+            $result = $this->verify();
+
+            // If there is only one error and error is ErrorBadCustomerCodeSyntax and we don't change customer code, we allow the update
+            // So we can update record that were using and old numbering rule.
+            if (is_array($this->errors))
+            {
+                if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
+                {
+                    if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+                }
+                if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
+                {
+                    if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+                }
+                if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
+                {
+                    $result = 0;
+                }
+            }
+        }
+
+        if ($result >= 0)
+        {
+            dol_syslog(get_class($this)."::update verify ok or not done");
+
+            $sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
+            $sql .= "entity = " . $this->db->escape($this->entity);
+            $sql .= ",nom = '" . $this->db->escape($this->name) ."'"; // Required
+            $sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
+            $sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
+            $sql .= ",address = '" . $this->db->escape($this->address) ."'";
+
+            $sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
+            $sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
+
+            $sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
+            $sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
+
+            $sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
+            $sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
+            $sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
+            $sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
+            $sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
+            $sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
+            $sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
+
+            $sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
+
+            $sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
+            $sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
+
+            $sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
+            $sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
+            $sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
+            $sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
+            $sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
+            $sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
+
+            $sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
+            $sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
+            $sql .= ",status = " .$this->status;
+
+            // Local taxes
+            $sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
+            $sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
+            if($this->localtax1_assuj==1)
+            {
+                if($this->localtax1_value!='')
+                {
+                    $sql .=",localtax1_value =".$this->localtax1_value;
+                }
+                else $sql .=",localtax1_value =0.000";
+            }
+            else $sql .=",localtax1_value =0.000";
+
+            if($this->localtax2_assuj==1)
+            {
+                if($this->localtax2_value!='')
+                {
+                    $sql .=",localtax2_value =".$this->localtax2_value;
+                }
+                else $sql .=",localtax2_value =0.000";
+            }
+            else $sql .=",localtax2_value =0.000";
+
+            $sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
+
+            $sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+
+            $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+            if (isset($this->stcomm_id))
+            {
+                $sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
+            }
+            $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
+
+            $sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
+
+            $sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
+            $sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
+            $sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
+            $sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
+            $sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
+
+            $sql .= ",client = " . (! empty($this->client)?$this->client:0);
+            $sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
+            $sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
+            $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
+            $sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
+            $sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
+            $sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
+            $sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
+            $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
+
+            $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
+            $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+
+            //Incoterms
+            $sql.= ", fk_incoterms = ".$this->fk_incoterms;
+            $sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+
+            if ($customer)
+            {
+                $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
+                $sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+            }
+
+            if ($supplier)
+            {
+                $sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
+                $sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+            }
+            $sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
+            $sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
+            $sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
+            $sql .= " WHERE rowid = " . (int) $id;
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                if (is_object($this->oldcopy))	// If we have information on old values
+                {
+                    if ($this->oldcopy->country_id != $this->country_id)
+                    {
+                        unset($this->country_code);
+                        unset($this->country);
+                    }
+                    if ($this->oldcopy->state_id != $this->state_id)
+                    {
+                        unset($this->state_code);
+                        unset($this->state);
+                    }
+                }
+                else
+                {
+                    unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
+                    unset($this->country);
+                    unset($this->state_code);
+                    unset($this->state);
+                }
+
+                $nbrowsaffected = $this->db->affected_rows($resql);
+
+                if (! $error && $nbrowsaffected)
+                {
+                    // Update information on linked member if it is an update
+                    if (! $nosyncmember && ! empty($conf->adherent->enabled))
+                    {
+                        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+                        dol_syslog(get_class($this)."::update update linked member");
+
+                        $lmember=new Adherent($this->db);
+                        $result=$lmember->fetch(0, 0, $this->id);
+
+                        if ($result > 0)
+                        {
+                            $lmember->societe=$this->name;
+                            //$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
+                            //$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
+                            $lmember->address=$this->address;
+                            $lmember->email=$this->email;
+                            $lmember->skype=$this->skype;
+                            $lmember->twitter=$this->twitter;
+                            $lmember->facebook=$this->facebook;
+                            $lmember->phone=$this->phone;
+
+                            $result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+                            if ($result < 0)
+                            {
+                                $this->error=$lmember->error;
+                                dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+                                $error++;
+                            }
+                        }
+                        elseif ($result < 0)
+                        {
+                            $this->error=$lmember->error;
+                            $error++;
+                        }
+                    }
+                }
+
+                $action='update';
+
+                // Actions on extra fields
+                if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                {
+                    $result=$this->insertExtraFields();
+                    if ($result < 0)
+                    {
+                        $error++;
+                    }
+                }
+
+                if (! $error && $call_trigger)
+                {
+                    // Call trigger
+                    $result=$this->call_trigger('COMPANY_MODIFY',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
+                }
+
+                if (! $error)
+                {
+                    dol_syslog(get_class($this)."::Update success");
+                    $this->db->commit();
+                    return 1;
+                }
+                else
+                {
+                    $this->db->rollback();
+                    return -1;
+                }
+            }
+            else
+            {
+                if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    // Doublon
+                    $this->error = $langs->trans("ErrorDuplicateField");
+                    $result = -1;
+                }
+                else
+                {
+                    $this->error = $this->db->lasterror();
+                    $result = -2;
+                }
+                $this->db->rollback();
+                return $result;
+            }
+        }
+        else
+        {
+            $this->db->rollback();
+            dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+            return -3;
+        }
+    }
+
+    /**
+     *    Load a third party from database into memory
+     *
+     *    @param	int		$rowid			Id of third party to load
+     *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
+     *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
+     *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
+     *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
+     *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
+     *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
+     *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
+     *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
+     *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
+     *    @param    string	$email   		Email of third party (Warning, this can return several records)
+     *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
+     *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
+     */
+    function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
+    {
+        global $langs;
+        global $conf;
+
+        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+
+        $sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
+        $sql .= ', s.status';
+        $sql .= ', s.price_level';
+        $sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
+        $sql .= ', s.phone, s.fax, s.email, s.skype, s.twitter, s.facebook, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
+        $sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
+        $sql .= ', s.capital, s.tva_intra';
+        $sql .= ', s.fk_typent as typent_id';
+        $sql .= ', s.fk_effectif as effectif_id';
+        $sql .= ', s.fk_forme_juridique as forme_juridique_code';
+        $sql .= ', s.webservices_url, s.webservices_key';
+        $sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
+        $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
+        $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
+        $sql .= ', s.fk_shipping_method';
+        $sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
+        $sql .= ', s.order_min_amount, s.supplier_order_min_amount';
+        $sql .= ', s.fk_multicurrency, s.multicurrency_code';
+        $sql .= ', fj.libelle as forme_juridique';
+        $sql .= ', e.libelle as effectif';
+        $sql .= ', c.code as country_code, c.label as country';
+        $sql .= ', d.code_departement as state_code, d.nom as state';
+        $sql .= ', st.libelle as stcomm';
+        $sql .= ', te.code as typent_code';
+        $sql .= ', i.libelle as libelle_incoterms';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
+
+        $sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
+        if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
+        if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+        if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
+        if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+        if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+        if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+        if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+        if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+        if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+        if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+        if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+        if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            if ($num > 1)
+            {
+                $this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+                dol_syslog($this->error, LOG_ERR);
+                $result = -2;
+            }
+            elseif ($num)   // $num = 1
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id           = $obj->rowid;
+                $this->entity       = $obj->entity;
+                $this->canvas		= $obj->canvas;
+
+                $this->ref          = $obj->rowid;
+                $this->name 		= $obj->name;
+                $this->nom          = $obj->name;		// deprecated
+                $this->name_alias = $obj->name_alias;
+                $this->ref_ext      = $obj->ref_ext;
+                $this->ref_int      = $obj->ref_int;
+
+                $this->date_creation     = $this->db->jdate($obj->date_creation);
+                $this->date_modification = $this->db->jdate($obj->date_modification);
+                $this->user_creation     = $obj->fk_user_creat;
+                $this->user_modification = $obj->fk_user_modif;
+
+                $this->address 		= $obj->address;
+                $this->zip 			= $obj->zip;
+                $this->town 		= $obj->town;
+
+                $this->country_id   = $obj->country_id;
+                $this->country_code = $obj->country_id?$obj->country_code:'';
+                $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+
+                $this->state_id     = $obj->fk_departement;
+                $this->state_code   = $obj->state_code;
+                $this->state        = ($obj->state!='-'?$obj->state:'');
+
+                $transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
+                $libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
+                $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
+                $this->statut_commercial = $libelle;    // libelle statut commercial
+
+                $this->email = $obj->email;
+                $this->skype = $obj->skype;
+                $this->twitter = $obj->twitter;
+                $this->facebook = $obj->facebook;
+                $this->url = $obj->url;
+                $this->phone = $obj->phone;
+                $this->fax = $obj->fax;
+
+                $this->parent    = $obj->parent;
+
+                $this->idprof1		= $obj->idprof1;
+                $this->idprof2		= $obj->idprof2;
+                $this->idprof3		= $obj->idprof3;
+                $this->idprof4		= $obj->idprof4;
+                $this->idprof5		= $obj->idprof5;
+                $this->idprof6		= $obj->idprof6;
+
+                $this->capital   = $obj->capital;
+
+                $this->code_client = $obj->code_client;
+                $this->code_fournisseur = $obj->code_fournisseur;
+
+                $this->code_compta = $obj->code_compta;
+                $this->code_compta_fournisseur = $obj->code_compta_fournisseur;
+
+                $this->barcode = $obj->barcode;
+
+                $this->tva_assuj      = $obj->tva_assuj;
+                $this->tva_intra      = $obj->tva_intra;
+                $this->status = $obj->status;
+
+                // Local Taxes
+                $this->localtax1_assuj      = $obj->localtax1_assuj;
+                $this->localtax2_assuj      = $obj->localtax2_assuj;
+
+                $this->localtax1_value		= $obj->localtax1_value;
+                $this->localtax2_value		= $obj->localtax2_value;
+
+                $this->typent_id      = $obj->typent_id;
+                $this->typent_code    = $obj->typent_code;
+
+                $this->effectif_id    = $obj->effectif_id;
+                $this->effectif       = $obj->effectif_id?$obj->effectif:'';
+
+                $this->forme_juridique_code= $obj->forme_juridique_code;
+                $this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+
+                $this->fk_prospectlevel = $obj->fk_prospectlevel;
+
+                $this->prefix_comm = $obj->prefix_comm;
+
+                $this->remise_percent		= $obj->remise_client;
+                $this->remise_supplier_percent		= $obj->remise_supplier;
+                $this->mode_reglement_id 	= $obj->mode_reglement;
+                $this->cond_reglement_id 	= $obj->cond_reglement;
+                $this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
+                $this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
+                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+                $this->fk_account			= $obj->fk_account;
+
+                $this->client      = $obj->client;
+                $this->fournisseur = $obj->fournisseur;
+
+                $this->note = $obj->note_private; // TODO Deprecated for backward comtability
+                $this->note_private = $obj->note_private;
+                $this->note_public = $obj->note_public;
+                $this->modelpdf = $obj->model_pdf;
+                $this->default_lang = $obj->default_lang;
+                $this->logo = $obj->logo;
+
+                $this->webservices_url = $obj->webservices_url;
+                $this->webservices_key = $obj->webservices_key;
+
+                $this->outstanding_limit		= $obj->outstanding_limit;
+                $this->order_min_amount			= $obj->order_min_amount;
+                $this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
+
+                // multiprix
+                $this->price_level = $obj->price_level;
+
+                $this->import_key = $obj->import_key;
+
+                //Incoterms
+                $this->fk_incoterms = $obj->fk_incoterms;
+                $this->location_incoterms = $obj->location_incoterms;
+                $this->libelle_incoterms = $obj->libelle_incoterms;
+
+                // multicurrency
+                $this->fk_multicurrency = $obj->fk_multicurrency;
+                $this->multicurrency_code = $obj->multicurrency_code;
+
+                $result = 1;
+
+                // fetch optionals attributes and labels
+                $this->fetch_optionals();
+            }
+            else
+            {
+                $result = 0;
+            }
+
+            $this->db->free($resql);
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $result = -3;
+        }
+
+        // Use first price level if level not defined for third party
+        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+
+        return $result;
+    }
+
+    /**
+     *    Delete a third party from database and all its dependencies (contacts, rib...)
+     *
+     *    @param	int		$id             Id of third party to delete
+     *    @param    User    $fuser          User who ask to delete thirparty
+     *    @param    int		$call_trigger   0=No, 1=yes
+     *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
+     */
+    function delete($id, User $fuser=null, $call_trigger=1)
+    {
+        global $langs, $conf, $user;
+
+        if (empty($fuser)) $fuser=$user;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $entity=isset($this->entity)?$this->entity:$conf->entity;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $error = 0;
+
+        // Test if child exists
+        $objectisused = $this->isObjectUsed($id);
+        if (empty($objectisused))
+        {
+            $this->db->begin();
+
+            // User is mandatory for trigger call
+            if (! $error && $call_trigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('COMPANY_DELETE',$fuser);
+                if ($result < 0) $error++;
+                // End call triggers
+            }
+
+            if (! $error)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+                $static_cat = new Categorie($this->db);
+                $toute_categs = array();
+
+                // Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
+                if ($this->client || $this->prospect)
+                {
+                    $toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+                }
+                if ($this->fournisseur)
+                {
+                    $toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+                }
+
+                // Remove each "Categorie"
+                foreach ($toute_categs as $type => $categs_type)
+                {
+                    foreach ($categs_type as $cat)
+                    {
+                        $cat->del_type($this, $type);
+                    }
+                }
+            }
+
+            foreach ($this->childtablesoncascade as $tabletodelete)
+            {
+                if (! $error)
+                {
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
+                    $sql.= " WHERE fk_soc = " . $id;
+                    if (! $this->db->query($sql))
+                    {
+                        $error++;
+                        $this->errors[] = $this->db->lasterror();
+                    }
+                }
+            }
+
+            // Removed extrafields
+            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+            {
+                $result=$this->deleteExtraFields();
+                if ($result < 0)
+                {
+                    $error++;
+                    dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+                }
+            }
+
+            // Remove links to subsidiaries companies
+            if (! $error)
+            {
+                $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+                $sql.= " SET parent = NULL";
+                $sql.= " WHERE parent = " . $id;
+                if (! $this->db->query($sql))
+                {
+                    $error++;
+                    $this->errors[] = $this->db->lasterror();
+                }
+            }
+
+            // Remove third party
+            if (! $error)
+            {
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
+                $sql.= " WHERE rowid = " . $id;
+                if (! $this->db->query($sql))
+                {
+                    $error++;
+                    $this->errors[] = $this->db->lasterror();
+                }
+            }
+
+            if (! $error)
+            {
+                $this->db->commit();
+
+                // Delete directory
+                if (! empty($conf->societe->multidir_output[$entity]))
+                {
+                    $docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+                    if (dol_is_dir($docdir))
+                    {
+                        dol_delete_dir_recursive($docdir);
+                    }
+                }
+
+                return 1;
+            }
+            else
+            {
+                dol_syslog($this->error, LOG_ERR);
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Define third party as a customer
-	 *
-	 *	@return		int		<0 if KO, >0 if OK
-	 */
-	function set_as_client()
-	{
+    /**
+     *  Define third party as a customer
+     *
+     *	@return		int		<0 if KO, >0 if OK
+     */
+    function set_as_client()
+    {
         // phpcs:enable
-		if ($this->id)
-		{
-			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET client = ".$newclient;
-			$sql.= " WHERE rowid = " . $this->id;
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->client = $newclient;
-				return 1;
-			}
-			else return -1;
-		}
-		return 0;
-	}
+        if ($this->id)
+        {
+            $newclient=1;
+            if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql.= " SET client = ".$newclient;
+            $sql.= " WHERE rowid = " . $this->id;
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->client = $newclient;
+                return 1;
+            }
+            else return -1;
+        }
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Definit la societe comme un client
-	 *
-	 *  @param	float	$remise		Valeur en % de la remise
-	 *  @param  string	$note		Note/Motif de modification de la remise
-	 *  @param  User	$user		Utilisateur qui definie la remise
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function set_remise_client($remise, $note, User $user)
-	{
+    /**
+     *  Definit la societe comme un client
+     *
+     *  @param	float	$remise		Valeur en % de la remise
+     *  @param  string	$note		Note/Motif de modification de la remise
+     *  @param  User	$user		Utilisateur qui definie la remise
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function set_remise_client($remise, $note, User $user)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
-		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
-			return -2;
-		}
-
-		dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
-
-		if ($this->id)
-		{
-			$this->db->begin();
-
-			$now=dol_now();
-
-			// Positionne remise courante
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error();
-				return -1;
-			}
-
-			// Ecrit trace dans historique des remises
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-			$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-
-			$this->db->commit();
-			return 1;
-		}
-	}
+        global $conf, $langs;
+
+        // Nettoyage parametres
+        $note=trim($note);
+        if (! $note)
+        {
+            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+            return -2;
+        }
+
+        dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
+
+        if ($this->id)
+        {
+            $this->db->begin();
+
+            $now=dol_now();
+
+            // Positionne remise courante
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+            $sql.= " SET remise_client = '".$this->db->escape($remise)."'";
+            $sql.= " WHERE rowid = " . $this->id;
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error();
+                return -1;
+            }
+
+            // Ecrit trace dans historique des remises
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
+            $sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+            $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql.= " '".$this->db->escape($note)."',";
+            $sql.= " ".$user->id;
+            $sql.= ")";
+
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+
+            $this->db->commit();
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Definit la societe comme un client
-	 *
-	 *  @param	float	$remise		Valeur en % de la remise
-	 *  @param  string	$note		Note/Motif de modification de la remise
-	 *  @param  User	$user		Utilisateur qui definie la remise
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function set_remise_supplier($remise, $note, User $user)
-	{
+    /**
+     *  Definit la societe comme un client
+     *
+     *  @param	float	$remise		Valeur en % de la remise
+     *  @param  string	$note		Note/Motif de modification de la remise
+     *  @param  User	$user		Utilisateur qui definie la remise
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function set_remise_supplier($remise, $note, User $user)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
-		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
-			return -2;
-		}
-
-		dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
-
-		if ($this->id)
-		{
-			$this->db->begin();
-
-			$now=dol_now();
-
-			// Positionne remise courante
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error();
-				return -1;
-			}
-
-			// Ecrit trace dans historique des remises
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
-			$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-
-			$this->db->commit();
-			return 1;
-		}
-	}
+        global $conf, $langs;
+
+        // Nettoyage parametres
+        $note=trim($note);
+        if (! $note)
+        {
+            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+            return -2;
+        }
+
+        dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
+
+        if ($this->id)
+        {
+            $this->db->begin();
+
+            $now=dol_now();
+
+            // Positionne remise courante
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+            $sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
+            $sql.= " WHERE rowid = " . $this->id;
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error();
+                return -1;
+            }
+
+            // Ecrit trace dans historique des remises
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
+            $sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
+            $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql.= " '".$this->db->escape($note)."',";
+            $sql.= " ".$user->id;
+            $sql.= ")";
+
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+
+            $this->db->commit();
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Add a discount for third party
-	 *
-	 *    	@param	float	$remise     	Amount of discount
-	 *    	@param  User	$user       	User adding discount
-	 *    	@param  string	$desc			Reason of discount
-	 *      @param  float	$tva_tx     	VAT rate
-	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *		@return	int					<0 if KO, id of discount record if OK
-	 */
-	function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
-	{
+    /**
+     *    	Add a discount for third party
+     *
+     *    	@param	float	$remise     	Amount of discount
+     *    	@param  User	$user       	User adding discount
+     *    	@param  string	$desc			Reason of discount
+     *      @param  float	$tva_tx     	VAT rate
+     *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
+     *		@return	int					<0 if KO, id of discount record if OK
+     */
+    function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		// Clean parameters
-		$remise = price2num($remise);
-		$desc = trim($desc);
-
-		// Check parameters
-		if (! $remise > 0)
-		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
-			return -1;
-		}
-		if (! $desc)
-		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","3");
-			return -2;
-		}
-
-		if ($this->id)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-			$discount = new DiscountAbsolute($this->db);
-			$discount->fk_soc=$this->id;
-
-			$discount->discount_type=$discount_type;
-
-			$discount->amount_ht=$discount->multicurrency_amount_ht=price2num($remise,'MT');
-			$discount->amount_tva=$discount->multicurrency_amount_tva=price2num($remise*$tva_tx/100,'MT');
-			$discount->amount_ttc=$discount->multicurrency_amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
-
-			$discount->tva_tx=price2num($tva_tx,'MT');
-			$discount->description=$desc;
-
-			$result=$discount->create($user);
-			if ($result > 0)
-			{
-				return $result;
-			}
-			else
-			{
-				$this->error=$discount->error;
-				return -3;
-			}
-		}
-		else return 0;
-	}
-
-	/**
-	 *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
-	 *
-	 *	@param	User	$user			Filtre sur un user auteur des remises
-	 * 	@param	string	$filter			Filtre autre
-	 * 	@param	integer	$maxvalue		Filter on max value for discount
-	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *	@return	int					<0 if KO, Credit note amount otherwise
-	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
-		if ($result >= 0)
-		{
-			return $result;
-		}
-		else
-		{
-			$this->error=$discountstatic->error;
-			return -1;
-		}
-	}
-
-	/**
-	 *  Return array of sales representatives
-	 *
-	 *  @param	User	$user		Object user
-	 *  @param	int		$mode		0=Array with properties, 1=Array of id.
-	 *  @return array       		Array of sales representatives of third party
-	 */
-	function getSalesRepresentatives(User $user, $mode=0)
-	{
-		global $conf;
-
-		$reparray=array();
-
-		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		{
-			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-			$sql.= " AND ug.entity = ".$conf->entity.")";
-			$sql.= " OR u.admin = 1)";
-		}
-		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
-
-		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				if (empty($mode))
-				{
-					$reparray[$i]['id']=$obj->rowid;
-					$reparray[$i]['lastname']=$obj->lastname;
-					$reparray[$i]['firstname']=$obj->firstname;
-					$reparray[$i]['email']=$obj->email;
-					$reparray[$i]['statut']=$obj->statut;
-					$reparray[$i]['entity']=$obj->entity;
-					$reparray[$i]['login']=$obj->login;
-					$reparray[$i]['photo']=$obj->photo;
-				}
-				else
-				{
-					$reparray[]=$obj->rowid;
-				}
-				$i++;
-			}
-			return $reparray;
-		}
-		else {
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+        global $langs;
+
+        // Clean parameters
+        $remise = price2num($remise);
+        $desc = trim($desc);
+
+        // Check parameters
+        if (! $remise > 0)
+        {
+            $this->error=$langs->trans("ErrorWrongValueForParameter","1");
+            return -1;
+        }
+        if (! $desc)
+        {
+            $this->error=$langs->trans("ErrorWrongValueForParameter","3");
+            return -2;
+        }
+
+        if ($this->id)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+            $discount = new DiscountAbsolute($this->db);
+            $discount->fk_soc=$this->id;
+
+            $discount->discount_type=$discount_type;
+
+            $discount->amount_ht=$discount->multicurrency_amount_ht=price2num($remise,'MT');
+            $discount->amount_tva=$discount->multicurrency_amount_tva=price2num($remise*$tva_tx/100,'MT');
+            $discount->amount_ttc=$discount->multicurrency_amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
+
+            $discount->tva_tx=price2num($tva_tx,'MT');
+            $discount->description=$desc;
+
+            $result=$discount->create($user);
+            if ($result > 0)
+            {
+                return $result;
+            }
+            else
+            {
+                $this->error=$discount->error;
+                return -3;
+            }
+        }
+        else return 0;
+    }
+
+    /**
+     *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
+     *
+     *	@param	User	$user			Filtre sur un user auteur des remises
+     * 	@param	string	$filter			Filtre autre
+     * 	@param	integer	$maxvalue		Filter on max value for discount
+     * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
+     *	@return	int					<0 if KO, Credit note amount otherwise
+     */
+    function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+        $discountstatic=new DiscountAbsolute($this->db);
+        $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
+        if ($result >= 0)
+        {
+            return $result;
+        }
+        else
+        {
+            $this->error=$discountstatic->error;
+            return -1;
+        }
+    }
+
+    /**
+     *  Return array of sales representatives
+     *
+     *  @param	User	$user		Object user
+     *  @param	int		$mode		0=Array with properties, 1=Array of id.
+     *  @return array       		Array of sales representatives of third party
+     */
+    function getSalesRepresentatives(User $user, $mode=0)
+    {
+        global $conf;
+
+        $reparray=array();
+
+        $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+        {
+            $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+            $sql.= " WHERE ((ug.fk_user = sc.fk_user";
+            $sql.= " AND ug.entity = ".$conf->entity.")";
+            $sql.= " OR u.admin = 1)";
+        }
+        else
+            $sql.= " WHERE entity in (0, ".$conf->entity.")";
+
+        $sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                if (empty($mode))
+                {
+                    $reparray[$i]['id']=$obj->rowid;
+                    $reparray[$i]['lastname']=$obj->lastname;
+                    $reparray[$i]['firstname']=$obj->firstname;
+                    $reparray[$i]['email']=$obj->email;
+                    $reparray[$i]['statut']=$obj->statut;
+                    $reparray[$i]['entity']=$obj->entity;
+                    $reparray[$i]['login']=$obj->login;
+                    $reparray[$i]['photo']=$obj->photo;
+                }
+                else
+                {
+                    $reparray[]=$obj->rowid;
+                }
+                $i++;
+            }
+            return $reparray;
+        }
+        else {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set the price level
-	 *
-	 * @param 	int		$price_level	Level of price
-	 * @param 	User	$user			Use making change
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function set_price_level($price_level, User $user)
-	{
+    /**
+     * Set the price level
+     *
+     * @param 	int		$price_level	Level of price
+     * @param 	User	$user			Use making change
+     * @return	int						<0 if KO, >0 if OK
+     */
+    function set_price_level($price_level, User $user)
+    {
         // phpcs:enable
-		if ($this->id)
-		{
-			$now=dol_now();
-
-			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-			$sql .= " WHERE rowid = " . $this->id;
-
-			if (! $this->db->query($sql))
-			{
-				dol_print_error($this->db);
-				return -1;
-			}
-
-			$sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
-			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
-			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
-
-			if (! $this->db->query($sql))
-			{
-				dol_print_error($this->db);
-				return -1;
-			}
-			return 1;
-		}
-		return -1;
-	}
+        if ($this->id)
+        {
+            $now=dol_now();
+
+            $sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql .= " SET price_level = '".$this->db->escape($price_level)."'";
+            $sql .= " WHERE rowid = " . $this->id;
+
+            if (! $this->db->query($sql))
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
+
+            $sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
+            $sql .= " (datec, fk_soc, price_level, fk_user_author)";
+            $sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
+
+            if (! $this->db->query($sql))
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
+            return 1;
+        }
+        return -1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Add link to sales representative
-	 *
-	 *	@param	User	$user		Object user
-	 *	@param	int		$commid		Id of user
-	 *	@return	void
-	 */
-	function add_commercial(User $user, $commid)
-	{
+    /**
+     *	Add link to sales representative
+     *
+     *	@param	User	$user		Object user
+     *	@param	int		$commid		Id of user
+     *	@return	void
+     */
+    function add_commercial(User $user, $commid)
+    {
         // phpcs:enable
-		$error=0;
+        $error=0;
 
 
-		if ($this->id > 0 && $commid > 0)
-		{
-			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+        if ($this->id > 0 && $commid > 0)
+        {
+            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
+            $sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			$this->db->query($sql);
+            $this->db->query($sql);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " ( fk_soc, fk_user )";
-			$sql.= " VALUES (".$this->id.",".$commid.")";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
+            $sql.= " ( fk_soc, fk_user )";
+            $sql.= " VALUES (".$this->id.",".$commid.")";
 
-			if (! $this->db->query($sql) )
-			{
-				dol_syslog(get_class($this)."::add_commercial Erreur");
-			}
-			else {
-				$this->context=array('commercial_modified'=>$commid);
+            if (! $this->db->query($sql) )
+            {
+                dol_syslog(get_class($this)."::add_commercial Erreur");
+            }
+            else {
+                $this->context=array('commercial_modified'=>$commid);
 
-				$result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
+                $result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
                 if ($result < 0) $error++;
-			}
-		}
-	}
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Add link to sales representative
-	 *
-	 *	@param	User	$user		Object user
-	 *	@param	int		$commid		Id of user
-	 *	@return	void
-	 */
-	function del_commercial(User $user, $commid)
-	{
+    /**
+     *	Add link to sales representative
+     *
+     *	@param	User	$user		Object user
+     *	@param	int		$commid		Id of user
+     *	@return	void
+     */
+    function del_commercial(User $user, $commid)
+    {
         // phpcs:enable
-		$error=0;
-		$this->context=array('commercial_modified'=>$commid);
+        $error=0;
+        $this->context=array('commercial_modified'=>$commid);
 
-		$result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
+        $result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
         if ($result < 0) $error++;
 
-		if ($this->id > 0 && $commid > 0)
-		{
-			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
-			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
-
-			if (! $this->db->query($sql) )
-			{
-				dol_syslog(get_class($this)."::del_commercial Erreur");
-			}
-		}
-	}
-
-
-	/**
-	 *    	Return a link on thirdparty (with picto)
-	 *
-	 *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-	 *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
-	 *		@param	int		$maxlen			          Max length of name
-	 *      @param	int  	$notooltip		          1=Disable tooltip
-	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *		@return	string					          String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
-	{
-		global $conf, $langs, $hookmanager;
-
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-		$name=$this->name?$this->name:$this->nom;
-
-		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
-
-             if(empty($option) && $this->client > 0) $option = 'customer';
-             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
-         }
-
-
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-		{
-			$code = '';
-			if (($this->client) && (! empty ( $this->code_client ))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-				)
-			)
-			{
-				$code = $this->code_client . ' - ';
-			}
-
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-				)
-			)
-			{
-				$code .= $this->code_fournisseur . ' - ';
-			}
-
-			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-			{
-				$name =$code.' '.$name;
-			}
-			else
-			{
-				$name =$code;
-			}
-		}
-
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
-
-		$result=''; $label='';
-		$linkstart=''; $linkend='';
-
-		if (! empty($this->logo) && class_exists('Form'))
-		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label.= '</div><div style="clear: both;"></div>';
-		}
-
-		$label.= '<div class="centpercent">';
-
-		if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
-		{
-		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
-		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
-			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier')
-		{
-			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
-		{
-			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
-		{
-			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
-		{
-			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
-		{
-			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
-		{
-			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
-		}
-
-		// By default
-		if (empty($linkstart))
-		{
-			$label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
-		}
-
-		if (! empty($this->name))
-		{
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
-		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
-		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
-		}
-		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-
-		$label.= '</div>';
-
-		// Add type of canvas
-		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
-		// 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) $linkstart.='&save_lastsearch_values=1';
-		$linkstart.='"';
-
-		$linkclose='';
-		if (empty($notooltip))
-		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label=$langs->trans("ShowCompany");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip refurl"';
-
-		 	/*
+        if ($this->id > 0 && $commid > 0)
+        {
+            $sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
+            $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+
+            if (! $this->db->query($sql) )
+            {
+                dol_syslog(get_class($this)."::del_commercial Erreur");
+            }
+        }
+    }
+
+
+    /**
+     *    	Return a link on thirdparty (with picto)
+     *
+     *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+     *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
+     *		@param	int		$maxlen			          Max length of name
+     *      @param	int  	$notooltip		          1=Disable tooltip
+     *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *		@return	string					          String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+    {
+        global $conf, $langs, $hookmanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+        $name=$this->name?$this->name:$this->nom;
+
+        if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+
+                if(empty($option) && $this->client > 0) $option = 'customer';
+                if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+            }
+
+
+        if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+        {
+            $code = '';
+            if (($this->client) && (! empty ( $this->code_client ))
+                && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+                || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+                )
+            )
+            {
+                $code = $this->code_client . ' - ';
+            }
+
+            if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+                && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+                || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+                )
+            )
+            {
+                $code .= $this->code_fournisseur . ' - ';
+            }
+
+            if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+            {
+                $name =$code.' '.$name;
+            }
+            else
+            {
+                $name =$code;
+            }
+        }
+
+        if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+
+        $result=''; $label='';
+        $linkstart=''; $linkend='';
+
+        if (! empty($this->logo) && class_exists('Form'))
+        {
+            $label.= '<div class="photointooltip">';
+            $label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+            $label.= '</div><div style="clear: both;"></div>';
+        }
+
+        $label.= '<div class="centpercent">';
+
+        if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
+        {
+            $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+        }
+        elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+        {
+            $label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+        }
+        elseif ($option == 'supplier')
+        {
+            $label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
+        }
+        elseif ($option == 'agenda')
+        {
+            $label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
+        }
+        elseif ($option == 'project')
+        {
+            $label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
+        }
+        elseif ($option == 'margin')
+        {
+            $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
+        }
+        elseif ($option == 'contact')
+        {
+            $label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
+        }
+        elseif ($option == 'ban')
+        {
+            $label.= '<u>' . $langs->trans("ShowBan") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
+        }
+
+        // By default
+        if (empty($linkstart))
+        {
+            $label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
+        }
+
+        if (! empty($this->name))
+        {
+            $label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
+            if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+            $label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
+        }
+        if (! empty($this->country_code))
+            $label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+        if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
+            $label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+        if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
+        {
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
+        }
+        if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
+            $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+        if (! empty($this->code_fournisseur) && $this->fournisseur)
+            $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+        if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
+            $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+        if (! empty($conf->accounting->enabled) && $this->fournisseur)
+            $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+
+        $label.= '</div>';
+
+        // Add type of canvas
+        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+        // 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) $linkstart.='&save_lastsearch_values=1';
+        $linkstart.='"';
+
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowCompany");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip refurl"';
+
+                /*
 			$hookmanager->initHooks(array('thirdpartydao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			*/
-		}
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		global $user;
-		if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
-		{
-			$linkstart='';
-			$linkend='';
-		}
-
-		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
-		$result.=$linkend;
-
-		global $action;
-		$hookmanager->initHooks(array('thirdpartydao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
-
-		return $result;
-	}
-
-	/**
-	 *    Return label of status (activity, closed)
-	 *
-	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *    @return   string        		Libelle
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+        }
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        global $user;
+        if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+        {
+            $linkstart='';
+            $linkend='';
+        }
+
+        $result.=$linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+        $result.=$linkend;
+
+        global $action;
+        $hookmanager->initHooks(array('thirdpartydao'));
+        $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+        $reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        if ($reshook > 0) $result = $hookmanager->resPrint;
+        else $result .= $hookmanager->resPrint;
+
+        return $result;
+    }
+
+    /**
+     *    Return label of status (activity, closed)
+     *
+     *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *    @return   string        		Libelle
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Renvoi le libelle d'un statut donne
-	 *
-	 *  @param	int		$statut         Id statut
-	 *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return	string          		Libelle du statut
-	 */
-	function LibStatut($statut,$mode=0)
-	{
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *
+     *  @param	int		$statut         Id statut
+     *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return	string          		Libelle du statut
+     */
+    function LibStatut($statut,$mode=0)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('companies');
-
-		if ($mode == 0)
-		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 1)
-		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 6)
-		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-	}
+        global $langs;
+        $langs->load('companies');
+
+        if ($mode == 0)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased");
+            elseif ($statut==1) return $langs->trans("InActivity");
+        }
+        elseif ($mode == 1)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased");
+            elseif ($statut==1) return $langs->trans("InActivity");
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+        elseif ($mode == 6)
+        {
+            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return list of contacts emails existing for third party
-	 *
-	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
-	 *    @return     array       					Array of contacts emails
-	 */
-	function thirdparty_and_contact_email_array($addthirdparty=0)
-	{
+    /**
+     *    Return list of contacts emails existing for third party
+     *
+     *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
+     *    @return     array       					Array of contacts emails
+     */
+    function thirdparty_and_contact_email_array($addthirdparty=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		$contact_emails = $this->contact_property_array('email',1);
-		if ($this->email && $addthirdparty)
-		{
-			if (empty($this->name)) $this->name=$this->nom;
-			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
-		}
-		//var_dump($contact_emails)
-		return $contact_emails;
-	}
+        global $langs;
+
+        $contact_emails = $this->contact_property_array('email',1);
+        if ($this->email && $addthirdparty)
+        {
+            if (empty($this->name)) $this->name=$this->nom;
+            $contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
+        }
+        //var_dump($contact_emails)
+        return $contact_emails;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return list of contacts mobile phone existing for third party
-	 *
-	 *    @return     array       Array of contacts emails
-	 */
-	function thirdparty_and_contact_phone_array()
-	{
+    /**
+     *    Return list of contacts mobile phone existing for third party
+     *
+     *    @return     array       Array of contacts emails
+     */
+    function thirdparty_and_contact_phone_array()
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		$contact_phone = $this->contact_property_array('mobile');
+        $contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
-		{
-			if (empty($this->name)) $this->name=$this->nom;
-			// TODO: Tester si tel non deja present dans tableau contact
-			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
-		}
-		return $contact_phone;
-	}
+        if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+        {
+            if (empty($this->name)) $this->name=$this->nom;
+            // TODO: Tester si tel non deja present dans tableau contact
+            $contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
+        }
+        return $contact_phone;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of contacts emails or mobile existing for third party
-	 *
-	 *  @param	string	$mode       		'email' or 'mobile'
-	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
-	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
-	 */
-	function contact_property_array($mode='email', $hidedisabled=0)
-	{
+    /**
+     *  Return list of contacts emails or mobile existing for third party
+     *
+     *  @param	string	$mode       		'email' or 'mobile'
+     * 	@param	int		$hidedisabled		1=Hide contact if disabled
+     *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
+     */
+    function contact_property_array($mode='email', $hidedisabled=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		$contact_property = array();
-
-
-		$sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE fk_soc = ".$this->id;
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
-				$sepa="("; $sepb=")";
-				if ($mode == 'email')
-				{
-					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa="<"; $sepb=">";
-				}
-				$i = 0;
-				while ($i < $nump)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
-
-					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
-					if ($obj->statut == 1 || empty($hidedisabled))
-					{
-						if (empty($property))
-						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
-						}
-
-						if (!empty($obj->poste))
-						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
-						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-					}
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $contact_property;
-	}
+        global $langs;
+
+        $contact_property = array();
+
+
+        $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql.= " WHERE fk_soc = ".$this->id;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $sepa="("; $sepb=")";
+                if ($mode == 'email')
+                {
+                    //$sepa="&lt;"; $sepb="&gt;";
+                    $sepa="<"; $sepb=">";
+                }
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if ($mode == 'email') $property=$obj->email;
+                    else if ($mode == 'mobile') $property=$obj->phone_mobile;
+                    else $property=$obj->$mode;
+
+                    // Show all contact. If hidedisabled is 1, showonly contacts with status = 1
+                    if ($obj->statut == 1 || empty($hidedisabled))
+                    {
+                        if (empty($property))
+                        {
+                            if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
+                            else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+                        }
+
+                        if (!empty($obj->poste))
+                        {
+                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+                        }
+                        else
+                        {
+                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+                        }
+                    }
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contact_property;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Renvoie la liste des contacts de cette societe
-	 *
-	 *    @return     array      tableau des contacts
-	 */
-	function contact_array()
-	{
+    /**
+     *    Renvoie la liste des contacts de cette societe
+     *
+     *    @return     array      tableau des contacts
+     */
+    function contact_array()
+    {
         // phpcs:enable
-		$contacts = array();
-
-		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
-				$i = 0;
-				while ($i < $nump)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $contacts;
-	}
+        $contacts = array();
+
+        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contacts;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Renvoie la liste des contacts de cette societe
-	 *
-	 *    @return    array    $contacts    tableau des contacts
-	 */
-	function contact_array_objects()
-	{
+    /**
+     *    Renvoie la liste des contacts de cette societe
+     *
+     *    @return    array    $contacts    tableau des contacts
+     */
+    function contact_array_objects()
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-		$contacts = array();
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
-				$i = 0;
-				while ($i < $nump)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$contact = new Contact($this->db);
-					$contact->fetch($obj->rowid);
-					$contacts[] = $contact;
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $contacts;
-	}
+        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        $contacts = array();
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $contact = new Contact($this->db);
+                    $contact->fetch($obj->rowid);
+                    $contacts[] = $contact;
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contacts;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return property of contact from its id
-	 *
-	 *  @param	int		$rowid      id of contact
-	 *  @param  string	$mode       'email' or 'mobile'
-	 *  @return string  			Email of contact with format: "Full name <email>"
-	 */
-	function contact_get_property($rowid,$mode)
-	{
+    /**
+     *  Return property of contact from its id
+     *
+     *  @param	int		$rowid      id of contact
+     *  @param  string	$mode       'email' or 'mobile'
+     *  @return string  			Email of contact with format: "Full name <email>"
+     */
+    function contact_get_property($rowid,$mode)
+    {
         // phpcs:enable
-		$contact_property='';
+        $contact_property='';
 
-		if (empty($rowid)) return '';
+        if (empty($rowid)) return '';
 
-		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE rowid = '".$rowid."'";
+        $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql.= " WHERE rowid = '".$rowid."'";
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
-				$obj = $this->db->fetch_object($resql);
+            if ($nump)
+            {
+                $obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
-				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
-			}
-			return $contact_property;
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+                if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+                else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+            }
+            return $contact_property;
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return bank number property of thirdparty (label or rum)
-	 *
-	 *	@param	string	$mode	'label' or 'rum' or 'format'
-	 *  @return	string			Bank number
-	 */
-	function display_rib($mode='label')
-	{
+    /**
+     *  Return bank number property of thirdparty (label or rum)
+     *
+     *	@param	string	$mode	'label' or 'rum' or 'format'
+     *  @return	string			Bank number
+     */
+    function display_rib($mode='label')
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-
-		$bac = new CompanyBankAccount($this->db);
-		$bac->fetch(0,$this->id);
-
-		if ($mode == 'label')
-		{
-			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
-		{
-			if (empty($bac->rum))
-			{
-				require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
-				$prelevement = new BonPrelevement($this->db);
-				$bac->fetch_thirdparty();
-				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
-			}
-			return $bac->rum;
-		}
-		elseif ($mode == 'format')
-		{
-			return $bac->frstrecur;
-		}
-
-		return 'BadParameterToFunctionDisplayRib';
-	}
+        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+
+        $bac = new CompanyBankAccount($this->db);
+        $bac->fetch(0,$this->id);
+
+        if ($mode == 'label')
+        {
+            return $bac->getRibLabel(true);
+        }
+        elseif ($mode == 'rum')
+        {
+            if (empty($bac->rum))
+            {
+                require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+                $prelevement = new BonPrelevement($this->db);
+                $bac->fetch_thirdparty();
+                $bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
+            }
+            return $bac->rum;
+        }
+        elseif ($mode == 'format')
+        {
+            return $bac->frstrecur;
+        }
+
+        return 'BadParameterToFunctionDisplayRib';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return Array of RIB
-	 *
-	 * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
-	 */
-	function get_all_rib()
-	{
+    /**
+     * Return Array of RIB
+     *
+     * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
+     */
+    function get_all_rib()
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
-		$result = $this->db->query($sql);
-		if (!$result) {
-			$this->error++;
-			$this->errors[] = $this->db->lasterror;
-			return 0;
-		} else {
-			$num_rows = $this->db->num_rows($result);
-			$rib_array = array();
-			if ($num_rows) {
-				while ($obj = $this->db->fetch_object($result)) {
-					$rib = new CompanyBankAccount($this->db);
-					$rib->fetch($obj->rowid);
-					$rib_array[] = $rib;
-				}
-			}
-			return $rib_array;
-		}
-	}
+        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
+        $result = $this->db->query($sql);
+        if (!$result) {
+            $this->error++;
+            $this->errors[] = $this->db->lasterror;
+            return 0;
+        } else {
+            $num_rows = $this->db->num_rows($result);
+            $rib_array = array();
+            if ($num_rows) {
+                while ($obj = $this->db->fetch_object($result)) {
+                    $rib = new CompanyBankAccount($this->db);
+                    $rib->fetch($obj->rowid);
+                    $rib_array[] = $rib;
+                }
+            }
+            return $rib_array;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Attribut un code client a partir du module de controle des codes.
-	 *  Return value is stored into this->code_client
-	 *
-	 *	@param	Societe		$objsoc		Object thirdparty
-	 *	@param	int			$type		Should be 0 to say customer
-	 *  @return void
-	 */
-	function get_codeclient($objsoc=0,$type=0)
-	{
+    /**
+     *  Attribut un code client a partir du module de controle des codes.
+     *  Return value is stored into this->code_client
+     *
+     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	int			$type		Should be 0 to say customer
+     *  @return void
+     */
+    function get_codeclient($objsoc=0,$type=0)
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-			$mod = new $module();
-
-			$this->code_client = $mod->getNextValue($objsoc,$type);
-			$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
-
-			dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+            $mod = new $module();
+
+            $this->code_client = $mod->getNextValue($objsoc,$type);
+            $this->prefixCustomerIsRequired = $mod->prefixIsRequired;
+
+            dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Attribut un code fournisseur a partir du module de controle des codes.
-	 *  Return value is stored into this->code_fournisseur
-	 *
-	 *	@param	Societe		$objsoc		Object thirdparty
-	 *	@param	int			$type		Should be 1 to say supplier
-	 *  @return void
-	 */
-	function get_codefournisseur($objsoc=0,$type=1)
-	{
+    /**
+     *  Attribut un code fournisseur a partir du module de controle des codes.
+     *  Return value is stored into this->code_fournisseur
+     *
+     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	int			$type		Should be 1 to say supplier
+     *  @return void
+     */
+    function get_codefournisseur($objsoc=0,$type=1)
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-			$mod = new $module();
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+            $mod = new $module();
 
-			$this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+            $this->code_fournisseur = $mod->getNextValue($objsoc,$type);
 
-			dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
-		}
-	}
+            dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Verifie si un code client est modifiable en fonction des parametres
-	 *    du module de controle des codes.
-	 *
-	 *    @return     int		0=No, 1=Yes
-	 */
-	function codeclient_modifiable()
-	{
+    /**
+     *    Verifie si un code client est modifiable en fonction des parametres
+     *    du module de controle des codes.
+     *
+     *    @return     int		0=No, 1=Yes
+     */
+    function codeclient_modifiable()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
-			return 0;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+            dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
+            if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
+            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            return 0;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes
-	 *
-	 *    @return     int		0=No, 1=Yes
-	 */
-	function codefournisseur_modifiable()
-	{
+    /**
+     *    Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes
+     *
+     *    @return     int		0=No, 1=Yes
+     */
+    function codefournisseur_modifiable()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
-			return 0;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+            dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
+            if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
+            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            return 0;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Check customer code
-	 *
-	 *  @return     int				0 if OK
-	 * 								-1 ErrorBadCustomerCodeSyntax
-	 * 								-2 ErrorCustomerCodeRequired
-	 * 								-3 ErrorCustomerCodeAlreadyUsed
-	 * 								-4 ErrorPrefixRequired
-	 */
-	function check_codeclient()
-	{
+    /**
+     *  Check customer code
+     *
+     *  @return     int				0 if OK
+     * 								-1 ErrorBadCustomerCodeSyntax
+     * 								-2 ErrorCustomerCodeRequired
+     * 								-3 ErrorCustomerCodeAlreadyUsed
+     * 								-4 ErrorPrefixRequired
+     */
+    function check_codeclient()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
-		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
-			return $result;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+                dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
+                $result = $mod->verif($this->db, $this->code_client, $this, 0);
+            return $result;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Check supplier code
-	 *
-	 *    @return     int		0 if OK
-	 * 							-1 ErrorBadCustomerCodeSyntax
-	 * 							-2 ErrorCustomerCodeRequired
-	 * 							-3 ErrorCustomerCodeAlreadyUsed
-	 * 							-4 ErrorPrefixRequired
-	 */
-	function check_codefournisseur()
-	{
+    /**
+     *    Check supplier code
+     *
+     *    @return     int		0 if OK
+     * 							-1 ErrorBadCustomerCodeSyntax
+     * 							-2 ErrorCustomerCodeRequired
+     * 							-3 ErrorCustomerCodeAlreadyUsed
+     * 							-4 ErrorPrefixRequired
+     */
+    function check_codefournisseur()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
-			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
-			return $result;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+            dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
+            $result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
+            return $result;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Renvoie un code compta, suivant le module de code compta.
-	 *      Peut etre identique a celui saisit ou genere automatiquement.
-	 *      A ce jour seule la generation automatique est implementee
-	 *
-	 *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
-	 *		@return	string				Code compta si ok, 0 si aucun, <0 si ko
-	 */
-	function get_codecompta($type)
-	{
+    /**
+     *    	Renvoie un code compta, suivant le module de code compta.
+     *      Peut etre identique a celui saisit ou genere automatiquement.
+     *      A ce jour seule la generation automatique est implementee
+     *
+     *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
+     *		@return	string				Code compta si ok, 0 si aucun, <0 si ko
+     */
+    function get_codecompta($type)
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
-		{
-			$res=false;
-			$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
-				if ($res) break;
-			}
-
-			if ($res)
-			{
-				$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
-				$mod = new $classname;
-
-				// Defini code compta dans $mod->code
-				$result = $mod->get_code($this->db, $this, $type);
-
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
-
-				return $result;
-			}
-			else
-			{
-				$this->error = 'ErrorAccountancyCodeNotDefined';
-				return -1;
-			}
-		}
-		else
-		{
-			if ($type == 'customer') $this->code_compta = '';
-			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
-
-			return 0;
-		}
-	}
+        global $conf;
+
+        if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+        {
+            $res=false;
+            $dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
+                if ($res) break;
+            }
+
+            if ($res)
+            {
+                $classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
+                $mod = new $classname;
+
+                // Defini code compta dans $mod->code
+                $result = $mod->get_code($this->db, $this, $type);
+
+                if ($type == 'customer') $this->code_compta = $mod->code;
+                else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+
+                return $result;
+            }
+            else
+            {
+                $this->error = 'ErrorAccountancyCodeNotDefined';
+                return -1;
+            }
+        }
+        else
+        {
+            if ($type == 'customer') $this->code_compta = '';
+            else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Define parent commany of current company
-	 *
-	 *    @param	int		$id     Id of thirdparty to set or '' to remove
-	 *    @return	int     		<0 if KO, >0 if OK
-	 */
-	function set_parent($id)
-	{
+    /**
+     *    Define parent commany of current company
+     *
+     *    @param	int		$id     Id of thirdparty to set or '' to remove
+     *    @return	int     		<0 if KO, >0 if OK
+     */
+    function set_parent($id)
+    {
         // phpcs:enable
-		if ($this->id)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET parent = ".($id > 0 ? $id : "null");
-			$sql.= " WHERE rowid = " . $this->id;
-			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->parent = $id;
-				return 1;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else return -1;
-	}
+        if ($this->id)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql.= " SET parent = ".($id > 0 ? $id : "null");
+            $sql.= " WHERE rowid = " . $this->id;
+            dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->parent = $id;
+                return 1;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else return -1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Returns if a profid sould be verified
-	 *
-	 *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
-	 *  @return boolean         	true , false
-	 */
-	function id_prof_verifiable($idprof)
-	{
+    /**
+     *  Returns if a profid sould be verified
+     *
+     *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
+     *  @return boolean         	true , false
+     */
+    function id_prof_verifiable($idprof)
+    {
         // phpcs:enable
-		global $conf;
-
-	 	switch($idprof)
-		{
-			case 1:
-				$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
-				break;
-			case 2:
-				$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
-				break;
-			case 3:
-				$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
-				break;
-			case 4:
-				$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
-				break;
-			case 5:
-				$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
-				break;
-			case 6:
-				$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
-				break;
-			default:
-				$ret=false;
-		}
-
-		return $ret;
-	}
+        global $conf;
+
+            switch($idprof)
+        {
+            case 1:
+                $ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+                break;
+            case 2:
+                $ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+                break;
+            case 3:
+                $ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+                break;
+            case 4:
+                $ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+                break;
+            case 5:
+                $ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+                break;
+            case 6:
+                $ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+                break;
+            default:
+                $ret=false;
+        }
+
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Verify if a profid exists into database for others thirds
-	 *
-	 *    @param	string	$idprof		'idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','email' (Example: idprof1=siren, idprof2=siret, idprof3=naf, idprof4=rcs/rm)
-	 *    @param	string	$value		Value of profid
-	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
-	 *    @return   boolean				True if exists, False if not
-	 */
-	function id_prof_exists($idprof, $value, $socid=0)
-	{
+    /**
+     *    Verify if a profid exists into database for others thirds
+     *
+     *    @param	string	$idprof		'idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','email' (Example: idprof1=siren, idprof2=siret, idprof3=naf, idprof4=rcs/rm)
+     *    @param	string	$value		Value of profid
+     *    @param	int		$socid		Id of thirdparty to exclude (if update)
+     *    @return   boolean				True if exists, False if not
+     */
+    function id_prof_exists($idprof, $value, $socid=0)
+    {
         // phpcs:enable
-		$field = $idprof;
-
-	 	switch($idprof)	// For backward compatibility
-		{
-			case '1':
-			case 'idprof1':
-				$field="siren";
-				break;
-			case '2':
-			case 'idprof2':
-				$field="siret";
-				break;
-			case '3':
-			case 'idprof3':
-				$field="ape";
-				break;
-			case '4':
-			case 'idprof4':
-				$field="idprof4";
-				break;
-			case '5':
-				$field="idprof5";
-				break;
-			case '6':
-				$field="idprof6";
-				break;
-	 	}
-
-		 //Verify duplicate entries
-		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$count = $obj->idprof;
-		}
-		else
-		{
-			$count = 0;
-			print $this->db->error();
-		}
-		$this->db->free($resql);
-
-		if ($count > 0) return true;
-		else return false;
-	}
+        $field = $idprof;
+
+            switch($idprof)	// For backward compatibility
+        {
+            case '1':
+            case 'idprof1':
+                $field="siren";
+                break;
+            case '2':
+            case 'idprof2':
+                $field="siret";
+                break;
+            case '3':
+            case 'idprof3':
+                $field="ape";
+                break;
+            case '4':
+            case 'idprof4':
+                $field="idprof4";
+                break;
+            case '5':
+                $field="idprof5";
+                break;
+            case '6':
+                $field="idprof6";
+                break;
+            }
+
+            //Verify duplicate entries
+        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+        if($socid) $sql .= " AND rowid <> ".$socid;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $count = $obj->idprof;
+        }
+        else
+        {
+            $count = 0;
+            print $this->db->error();
+        }
+        $this->db->free($resql);
+
+        if ($count > 0) return true;
+        else return false;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...)
-	 *
-	 *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
-	 *  @param  Societe		$soc            Objet societe
-	 *  @return int             			<=0 if KO, >0 if OK
-	 *  TODO better to have this in a lib than into a business class
-	 */
-	function id_prof_check($idprof,$soc)
-	{
+    /**
+     *  Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...)
+     *
+     *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
+     *  @param  Societe		$soc            Objet societe
+     *  @return int             			<=0 if KO, >0 if OK
+     *  TODO better to have this in a lib than into a business class
+     */
+    function id_prof_check($idprof,$soc)
+    {
         // phpcs:enable
-		global $conf;
-
-		$ok=1;
-
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
-
-		// Verifie SIREN si pays FR
-		if ($idprof == 1 && $soc->country_code == 'FR')
-		{
-			$chaine=trim($this->idprof1);
-			$chaine=preg_replace('/(\s)/','',$chaine);
-
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 9) return -1;
-
-			// on prend chaque chiffre un par un
-			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
-			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
-			// on ajoute cette valeur à la somme totale
-
-			for ($index = 0; $index < 9; $index ++)
-			{
-				$number = (int) $siren[$index];
-				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
-				$sum += $number;
-			}
-
-			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
-		}
-
-		// Verifie SIRET si pays FR
-		if ($idprof == 2 && $soc->country_code == 'FR')
-		{
-			$chaine=trim($this->idprof2);
-			$chaine=preg_replace('/(\s)/','',$chaine);
-
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 14) return -1;
-
-			// on prend chaque chiffre un par un
-			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
-			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
-			// on ajoute cette valeur à la somme totale
-
-			for ($index = 0; $index < 14; $index ++)
-			{
-				$number = (int) $chaine[$index];
-				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
-				$sum += $number;
-			}
-
-			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
-		}
-
-		//Verify CIF/NIF/NIE if pays ES
-		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'ES')
-		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
-			$string = strtoupper($string);
-
-			for ($i = 0; $i < 9; $i ++)
-			$num[$i] = substr($string, $i, 1);
-
-			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
-				return 1;
-				else
-				return -1;
-
-			//algorithm checking type code CIF
-			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
-			$n = 10 - substr($sum, strlen($sum) - 1, 1);
-
-			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
-				return 1;
-				else
-				return -1;
-
-			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
-				return 2;
-				else
-				return -2;
-
-			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
-				return 3;
-				else
-				return -3;
-
-			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
-				return 3;
-				else
-				return -3;
-
-			//Can not be verified
-			return -4;
-		}
-
-		//Verify NIF if country is PT
-		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'PT')
-		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
-
-			for ($i = 0; $i < 9; $i ++) {
-				$num[$i] = substr($string, $i, 1);
-			}
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{9}$)/', $string)) {
-				return 1;
-			}
-			else {
-				return -1;
-			}
-		}
-
-		return $ok;
-	}
+        global $conf;
+
+        $ok=1;
+
+        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+
+        // Verifie SIREN si pays FR
+        if ($idprof == 1 && $soc->country_code == 'FR')
+        {
+            $chaine=trim($this->idprof1);
+            $chaine=preg_replace('/(\s)/','',$chaine);
+
+            if (!is_numeric($chaine)) return -1;
+            if (dol_strlen($chaine) != 9) return -1;
+
+            // on prend chaque chiffre un par un
+            // si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
+            // on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
+            // on ajoute cette valeur à la somme totale
+
+            for ($index = 0; $index < 9; $index ++)
+            {
+                $number = (int) $siren[$index];
+                if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+                $sum += $number;
+            }
+
+            // le numéro est valide si la somme des chiffres est multiple de 10
+            if (($sum % 10) != 0) return -1;
+        }
+
+        // Verifie SIRET si pays FR
+        if ($idprof == 2 && $soc->country_code == 'FR')
+        {
+            $chaine=trim($this->idprof2);
+            $chaine=preg_replace('/(\s)/','',$chaine);
+
+            if (!is_numeric($chaine)) return -1;
+            if (dol_strlen($chaine) != 14) return -1;
+
+            // on prend chaque chiffre un par un
+            // si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
+            // on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
+            // on ajoute cette valeur à la somme totale
+
+            for ($index = 0; $index < 14; $index ++)
+            {
+                $number = (int) $chaine[$index];
+                if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+                $sum += $number;
+            }
+
+            // le numéro est valide si la somme des chiffres est multiple de 10
+            if (($sum % 10) != 0) return -1;
+        }
+
+        //Verify CIF/NIF/NIE if pays ES
+        //Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
+        if ($idprof == 1 && $soc->country_code == 'ES')
+        {
+            $string=trim($this->idprof1);
+            $string=preg_replace('/(\s)/','',$string);
+            $string = strtoupper($string);
+
+            for ($i = 0; $i < 9; $i ++)
+            $num[$i] = substr($string, $i, 1);
+
+            //Check format
+            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
+            return 0;
+
+            //Check NIF
+            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
+                if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+                return 1;
+                else
+                return -1;
+
+            //algorithm checking type code CIF
+            $sum = $num[2] + $num[4] + $num[6];
+            for ($i = 1; $i < 8; $i += 2)
+            $sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+            $n = 10 - substr($sum, strlen($sum) - 1, 1);
+
+            //Chek special NIF
+            if (preg_match('/^[KLM]{1}/', $string))
+                if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+                return 1;
+                else
+                return -1;
+
+            //Check CIF
+            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
+                if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+                return 2;
+                else
+                return -2;
+
+            //Check NIE T
+            if (preg_match('/^[T]{1}/', $string))
+                if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+                return 3;
+                else
+                return -3;
+
+            //Check NIE XYZ
+            if (preg_match('/^[XYZ]{1}/', $string))
+                if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+                return 3;
+                else
+                return -3;
+
+            //Can not be verified
+            return -4;
+        }
+
+        //Verify NIF if country is PT
+        //Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
+        if ($idprof == 1 && $soc->country_code == 'PT')
+        {
+            $string=trim($this->idprof1);
+            $string=preg_replace('/(\s)/','',$string);
+
+            for ($i = 0; $i < 9; $i ++) {
+                $num[$i] = substr($string, $i, 1);
+            }
+
+            //Check NIF
+            if (preg_match('/(^[0-9]{9}$)/', $string)) {
+                return 1;
+            }
+            else {
+                return -1;
+            }
+        }
+
+        return $ok;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Return an url to check online a professional id or empty string
-	 *
-	 *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
-	 *   @param 	Societe	$thirdparty     Object thirdparty
-	 *   @return	string          		Url or empty string if no URL known
-	 *   TODO better in a lib than into business class
-	 */
-	function id_prof_url($idprof,$thirdparty)
-	{
+    /**
+     *   Return an url to check online a professional id or empty string
+     *
+     *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+     *   @param 	Societe	$thirdparty     Object thirdparty
+     *   @return	string          		Url or empty string if no URL known
+     *   TODO better in a lib than into business class
+     */
+    function id_prof_url($idprof,$thirdparty)
+    {
         // phpcs:enable
-		global $conf,$langs,$hookmanager;
+        global $conf,$langs,$hookmanager;
 
-		$url='';
-		$action = '';
+        $url='';
+        $action = '';
 
-		$hookmanager->initHooks(array('idprofurl'));
-		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook)) {
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-				return '';
-			}
+        $hookmanager->initHooks(array('idprofurl'));
+        $parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
+        $reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        if (empty($reshook)) {
+            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+                return '';
+            }
 
-			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
+            // TODO Move links to validate professional ID into a dictionary table "country" + "link"
             $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
-			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
-				$url='http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
-			}
-			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
-				$url='https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
-			}
-			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
-				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
-			}
-			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
-				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
-			}
-			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
-				$url='http://www.nif.pt/'.$strippedIdProf1;
-			}
-
-			if ($url) {
-				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
-			}
-		}
-		else {
-			return $hookmanager->resPrint;
-		}
-
-		return '';
-	}
+            if ($idprof == 1 && $thirdparty->country_code == 'FR') {
+                $url='http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
+            }
+            if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
+                $url='https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'ES') {
+                $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'IN') {
+                $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'PT') {
+                $url='http://www.nif.pt/'.$strippedIdProf1;
+            }
+
+            if ($url) {
+                return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+            }
+        }
+        else {
+            return $hookmanager->resPrint;
+        }
+
+        return '';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Indique si la societe a des projets
-	 *
-	 *   @return     bool	   true si la societe a des projets, false sinon
-	 */
-	function has_projects()
-	{
+    /**
+     *   Indique si la societe a des projets
+     *
+     *   @return     bool	   true si la societe a des projets, false sinon
+     */
+    function has_projects()
+    {
         // phpcs:enable
-		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$count = $obj->numproj;
-		}
-		else
-		{
-			$count = 0;
-			print $this->db->error();
-		}
-		$this->db->free($resql);
-		return ($count > 0);
-	}
-
-
-	/**
-	 *  Load information for tab info
-	 *
-	 *  @param  int		$id     Id of thirdparty to load
-	 *  @return	void
-	 */
-	function info($id)
-	{
-		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-		$sql.= " fk_user_creat, fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.rowid = ".$id;
-
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$this->id = $obj->rowid;
-
-				if ($obj->fk_user_creat) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
-				}
-
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
-
-				$this->ref			     = $obj->name;
-				$this->date_creation     = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 *  Return if third party is a company (Business) or an end user (Consumer)
-	 *
-	 *  @return    boolean     true=is a company, false=a and user
-	 */
-	function isACompany()
-	{
-		global $conf;
-
-		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
-		{
-			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
-			else $isacompany=1;
-		}
-
-		return $isacompany;
-	}
-
-	/**
-	 *  Return if a company is inside the EEC (European Economic Community)
-	 *
-	 *  @return     boolean		true = country inside EEC, false = country outside EEC
-	 */
-	function isInEEC()
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-		return isInEEC($this);
-	}
+        $sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $count = $obj->numproj;
+        }
+        else
+        {
+            $count = 0;
+            print $this->db->error();
+        }
+        $this->db->free($resql);
+        return ($count > 0);
+    }
+
+
+    /**
+     *  Load information for tab info
+     *
+     *  @param  int		$id     Id of thirdparty to load
+     *  @return	void
+     */
+    function info($id)
+    {
+        $sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
+        $sql.= " fk_user_creat, fk_user_modif";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE s.rowid = ".$id;
+
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $this->id = $obj->rowid;
+
+                if ($obj->fk_user_creat) {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_creat);
+                    $this->user_creation     = $cuser;
+                }
+
+                if ($obj->fk_user_modif) {
+                    $muser = new User($this->db);
+                    $muser->fetch($obj->fk_user_modif);
+                    $this->user_modification = $muser;
+                }
+
+                $this->ref			     = $obj->name;
+                $this->date_creation     = $this->db->jdate($obj->date_creation);
+                $this->date_modification = $this->db->jdate($obj->date_modification);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *  Return if third party is a company (Business) or an end user (Consumer)
+     *
+     *  @return    boolean     true=is a company, false=a and user
+     */
+    function isACompany()
+    {
+        global $conf;
+
+        // Define if third party is treated as company (or not) when nature is unknown
+        $isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
+        if (! empty($this->tva_intra)) $isacompany=1;
+        else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+        {
+            // TODO Add a field is_a_company into dictionary
+            if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
+            else $isacompany=1;
+        }
+
+        return $isacompany;
+    }
+
+    /**
+     *  Return if a company is inside the EEC (European Economic Community)
+     *
+     *  @return     boolean		true = country inside EEC, false = country outside EEC
+     */
+    function isInEEC()
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+        return isInEEC($this);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Charge la liste des categories fournisseurs
-	 *
-	 *  @return    int      0 if success, <> 0 if error
-	 */
-	function LoadSupplierCateg()
-	{
+    /**
+     *  Charge la liste des categories fournisseurs
+     *
+     *  @return    int      0 if success, <> 0 if error
+     */
+    function LoadSupplierCateg()
+    {
         // phpcs:enable
-		$this->SupplierCategories = array();
-		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql) )
-			{
-				$this->SupplierCategories[$obj->rowid] = $obj->label;
-			}
-			return 0;
-		}
-		else
-		{
-			return -1;
-		}
-	}
+        $this->SupplierCategories = array();
+        $sql = "SELECT rowid, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj = $this->db->fetch_object($resql) )
+            {
+                $this->SupplierCategories[$obj->rowid] = $obj->label;
+            }
+            return 0;
+        }
+        else
+        {
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Insert link supplier - category
-	 *
-	 *	@param	int		$categorie_id		Id of category
-	 *  @return int      					0 if success, <> 0 if error
-	 */
-	function AddFournisseurInCategory($categorie_id)
-	{
+    /**
+     *  Insert link supplier - category
+     *
+     *	@param	int		$categorie_id		Id of category
+     *  @return int      					0 if success, <> 0 if error
+     */
+    function AddFournisseurInCategory($categorie_id)
+    {
         // phpcs:enable
-		if ($categorie_id > 0 && $this->id > 0)
-		{
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
+        if ($categorie_id > 0 && $this->id > 0)
+        {
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
+            $sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
-		}
-		else
-		{
-			return 0;
-		}
-		return -1;
-	}
+            if ($resql=$this->db->query($sql)) return 0;
+        }
+        else
+        {
+            return 0;
+        }
+        return -1;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Create a third party into database from a member object
-	 *
-	 *  @param	Adherent	$member			Object member
-	 * 	@param	string		$socname		Name of third party to force
-	 *	@param	string		$socalias		Alias name of third party to force
-	 *  @param	string		$customercode	Customer code
-	 *  @return int							<0 if KO, id of created account if OK
-	 */
-	function create_from_member(Adherent $member, $socname='', $socalias='', $customercode='')
-	{
+    /**
+     *  Create a third party into database from a member object
+     *
+     *  @param	Adherent	$member			Object member
+     * 	@param	string		$socname		Name of third party to force
+     *	@param	string		$socalias		Alias name of third party to force
+     *  @param	string		$customercode	Customer code
+     *  @return int							<0 if KO, id of created account if OK
+     */
+    function create_from_member(Adherent $member, $socname='', $socalias='', $customercode='')
+    {
         // phpcs:enable
-		global $user,$langs;
-
-		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
-
-		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
-
-		$alias = $socalias?$socalias:'';
-
-		// Positionne parametres
-		$this->nom=$name;				// TODO deprecated
-		$this->name=$name;
-		$this->name_alias=$alias;
-		$this->address=$member->address;
-		$this->zip=$member->zip;
-		$this->town=$member->town;
-		$this->country_code=$member->country_code;
-		$this->country_id=$member->country_id;
-		$this->phone=$member->phone;       // Prof phone
-		$this->email=$member->email;
-		$this->skype=$member->skype;
-		$this->twitter=$member->twitter;
-		$this->facebook=$member->facebook;
-
-		$this->client = 1;				// A member is a customer by default
-		$this->code_client = ($customercode?$customercode:-1);
-		$this->code_fournisseur = -1;
-
-		$this->db->begin();
-
-		// Cree et positionne $this->id
-		$result=$this->create($user);
-		if ($result >= 0)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-			$sql.= " SET fk_soc=".$this->id;
-			$sql.= " WHERE rowid=".$member->id;
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->db->commit();
-				return $this->id;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else
-		{
-			// $this->error deja positionne
-			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
-
-			$this->db->rollback();
-			return $result;
-		}
-	}
-
-	/**
-	 * 	Set properties with value into $conf
-	 *
-	 * 	@param	Conf	$conf		Conf object (possibility to use another entity)
-	 * 	@return	void
-	 */
-	function setMysoc(Conf $conf)
-	{
-		global $langs;
-
-		$this->id=0;
-		$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
-		$this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
-		$this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
-
-		$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
-
-		$this->nom=$this->name; 									// deprecated
-
-		// We define country_id, country_code and country
-		$country_id=$country_code=$country_label='';
-		if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-		{
-			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
-			{
-				$country_code=$tmp[1];
-				$country_label=$tmp[2];
-			}
-			else                    // For backward compatibility
-			{
-				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-				$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-				$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-			}
-		}
-		$this->country_id=$country_id;
-		$this->country_code=$country_code;
-		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
-
-		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
-		// Id prof generiques
-		$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-		$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-		$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-		$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-		$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-		$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-		$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-		$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-		$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-		$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-		$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-
-		// Define if company use vat or not
-		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
-
-		// Define if company use local taxes
-		$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-		$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
-	}
-
-	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		$now=dol_now();
-
-		// Initialize parameters
-		$this->id=0;
-		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-		$this->nom = $this->name;   // For backward compatibility
-		$this->ref_ext = 'Ref ext';
-		$this->specimen=1;
-		$this->address='21 jump street';
-		$this->zip='99999';
-		$this->town='MyTown';
-		$this->state_id=1;
-		$this->state_code='AA';
-		$this->state='MyState';
-		$this->country_id=1;
-		$this->country_code='FR';
-		$this->email='specimen@specimen.com';
-		$this->skype='tom.hanson';
-		$this->twitter='tomhanson';
-		$this->facebook='tomhanson';
-		$this->url='http://www.specimen.com';
-
-		$this->phone='0909090901';
-		$this->fax='0909090909';
-
-		$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-		$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-		$this->capital=10000;
-		$this->client=1;
-		$this->prospect=1;
-		$this->fournisseur=1;
-		$this->tva_assuj=1;
-		$this->tva_intra='EU1234567';
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
-
-		$this->idprof1='idprof1';
-		$this->idprof2='idprof2';
-		$this->idprof3='idprof3';
-		$this->idprof4='idprof4';
-		$this->idprof5='idprof5';
-		$this->idprof6='idprof6';
-	}
-
-	/**
-	 *  Check if we must use localtax feature or not according to country (country of $mysoc in most cases).
-	 *
-	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
-	 *  @return		boolean					true or false
-	 */
-	function useLocalTax($localTaxNum=0)
-	{
-		$sql  = "SELECT t.localtax1, t.localtax2";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
-
-		dol_syslog("useLocalTax", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-   			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
-	}
-
-	/**
-	 *  Check if we must use NPR Vat (french stupid rule) or not according to country (country of $mysoc in most cases).
-	 *
-	 *  @return		boolean					true or false
-	 */
-	function useNPR()
-	{
-		$sql  = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-		$sql .= " AND t.active = 1 AND t.recuperableonly = 1";
-
-		dol_syslog("useNPR", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
-	}
-
-	/**
-	 *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
-	 *
-	 *  @return		boolean			true or false
-	 */
-	function useRevenueStamp()
-	{
-		$sql  = "SELECT COUNT(*) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-		$sql .= " AND r.active = 1";
-
-		dol_syslog("useRevenueStamp", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj=$this->db->fetch_object($resql);
-   			return (($obj->nb > 0)?true:false);
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return false;
-		}
-	}
-
-	/**
-	 *	Return prostect level
-	 *
-	 *  @return     string        Libelle
-	 */
-	function getLibProspLevel()
-	{
-		return $this->LibProspLevel($this->fk_prospectlevel);
-	}
+        global $user,$langs;
+
+        dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
+
+        $name = $socname?$socname:$member->societe;
+        if (empty($name)) $name=$member->getFullName($langs);
+
+        $alias = $socalias?$socalias:'';
+
+        // Positionne parametres
+        $this->nom=$name;				// TODO deprecated
+        $this->name=$name;
+        $this->name_alias=$alias;
+        $this->address=$member->address;
+        $this->zip=$member->zip;
+        $this->town=$member->town;
+        $this->country_code=$member->country_code;
+        $this->country_id=$member->country_id;
+        $this->phone=$member->phone;       // Prof phone
+        $this->email=$member->email;
+        $this->skype=$member->skype;
+        $this->twitter=$member->twitter;
+        $this->facebook=$member->facebook;
+
+        $this->client = 1;				// A member is a customer by default
+        $this->code_client = ($customercode?$customercode:-1);
+        $this->code_fournisseur = -1;
+
+        $this->db->begin();
+
+        // Cree et positionne $this->id
+        $result=$this->create($user);
+        if ($result >= 0)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+            $sql.= " SET fk_soc=".$this->id;
+            $sql.= " WHERE rowid=".$member->id;
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->db->commit();
+                return $this->id;
+            }
+            else
+            {
+                $this->error=$this->db->error();
+
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else
+        {
+            // $this->error deja positionne
+            dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+
+            $this->db->rollback();
+            return $result;
+        }
+    }
+
+    /**
+     * 	Set properties with value into $conf
+     *
+     * 	@param	Conf	$conf		Conf object (possibility to use another entity)
+     * 	@return	void
+     */
+    function setMysoc(Conf $conf)
+    {
+        global $langs;
+
+        $this->id=0;
+        $this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
+        $this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+        $this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
+        $this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
+        $this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
+        $this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
+        $this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
+
+        $this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+
+        $this->nom=$this->name; 									// deprecated
+
+        // We define country_id, country_code and country
+        $country_id=$country_code=$country_label='';
+        if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+        {
+            $tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+            $country_id=$tmp[0];
+            if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+            {
+                $country_code=$tmp[1];
+                $country_label=$tmp[2];
+            }
+            else                    // For backward compatibility
+            {
+                dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+                $country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+                $country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+            }
+        }
+        $this->country_id=$country_id;
+        $this->country_code=$country_code;
+        $this->country=$country_label;
+        if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+
+        $this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
+        $this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
+        $this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+        // Id prof generiques
+        $this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
+        $this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
+        $this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
+        $this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
+        $this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
+        $this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
+        $this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
+        $this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+        $this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
+        $this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+        $this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        $this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
+        $this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+        $this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+
+        // Define if company use vat or not
+        $this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+
+        // Define if company use local taxes
+        $this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
+        $this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+    }
+
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+     */
+    function initAsSpecimen()
+    {
+        $now=dol_now();
+
+        // Initialize parameters
+        $this->id=0;
+        $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
+        $this->nom = $this->name;   // For backward compatibility
+        $this->ref_ext = 'Ref ext';
+        $this->specimen=1;
+        $this->address='21 jump street';
+        $this->zip='99999';
+        $this->town='MyTown';
+        $this->state_id=1;
+        $this->state_code='AA';
+        $this->state='MyState';
+        $this->country_id=1;
+        $this->country_code='FR';
+        $this->email='specimen@specimen.com';
+        $this->skype='tom.hanson';
+        $this->twitter='tomhanson';
+        $this->facebook='tomhanson';
+        $this->url='http://www.specimen.com';
+
+        $this->phone='0909090901';
+        $this->fax='0909090909';
+
+        $this->code_client='CC-'.dol_print_date($now,'dayhourlog');
+        $this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
+        $this->capital=10000;
+        $this->client=1;
+        $this->prospect=1;
+        $this->fournisseur=1;
+        $this->tva_assuj=1;
+        $this->tva_intra='EU1234567';
+        $this->note_public='This is a comment (public)';
+        $this->note_private='This is a comment (private)';
+
+        $this->idprof1='idprof1';
+        $this->idprof2='idprof2';
+        $this->idprof3='idprof3';
+        $this->idprof4='idprof4';
+        $this->idprof5='idprof5';
+        $this->idprof6='idprof6';
+    }
+
+    /**
+     *  Check if we must use localtax feature or not according to country (country of $mysoc in most cases).
+     *
+     *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
+     *  @return		boolean					true or false
+     */
+    function useLocalTax($localTaxNum=0)
+    {
+        $sql  = "SELECT t.localtax1, t.localtax2";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+        $sql .= " AND t.active = 1";
+        if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+        elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
+        elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+
+        dol_syslog("useLocalTax", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+                return ($this->db->num_rows($resql) > 0);
+        }
+        else return false;
+    }
+
+    /**
+     *  Check if we must use NPR Vat (french stupid rule) or not according to country (country of $mysoc in most cases).
+     *
+     *  @return		boolean					true or false
+     */
+    function useNPR()
+    {
+        $sql  = "SELECT t.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+        $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
+
+        dol_syslog("useNPR", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            return ($this->db->num_rows($resql) > 0);
+        }
+        else return false;
+    }
+
+    /**
+     *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
+     *
+     *  @return		boolean			true or false
+     */
+    function useRevenueStamp()
+    {
+        $sql  = "SELECT COUNT(*) as nb";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+        $sql .= " AND r.active = 1";
+
+        dol_syslog("useRevenueStamp", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj=$this->db->fetch_object($resql);
+                return (($obj->nb > 0)?true:false);
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return false;
+        }
+    }
+
+    /**
+     *	Return prostect level
+     *
+     *  @return     string        Libelle
+     */
+    function getLibProspLevel()
+    {
+        return $this->LibProspLevel($this->fk_prospectlevel);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return label of prospect level
-	 *
-	 *  @param	int		$fk_prospectlevel   	Prospect level
-	 *  @return string        					label of level
-	 */
-	function LibProspLevel($fk_prospectlevel)
-	{
+    /**
+     *  Return label of prospect level
+     *
+     *  @param	int		$fk_prospectlevel   	Prospect level
+     *  @return string        					label of level
+     */
+    function LibProspLevel($fk_prospectlevel)
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
-		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
-		{
-			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
-		}
-		return $lib;
-	}
+        $lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+        // If lib not found in language file, we get label from cache/databse
+        if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
+        {
+            $lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+        }
+        return $lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set prospect level
-	 *
-	 *  @param  User	$user		Utilisateur qui definie la remise
-	 *	@return	int					<0 if KO, >0 if OK
-	 * @deprecated Use update function instead
-	 */
-	function set_prospect_level(User $user)
-	{
+    /**
+     *  Set prospect level
+     *
+     *  @param  User	$user		Utilisateur qui definie la remise
+     *	@return	int					<0 if KO, >0 if OK
+     * @deprecated Use update function instead
+     */
+    function set_prospect_level(User $user)
+    {
         // phpcs:enable
-		return $this->update($this->id, $user);
-	}
-
-	/**
-	 *  Return status of prospect
-	 *
-	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
-	 *  @param	string	$label		Label to use for status for added status
-	 *  @return string        		Libelle
-	 */
-	function getLibProspCommStatut($mode=0, $label='')
-	{
-		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
-	}
+        return $this->update($this->id, $user);
+    }
+
+    /**
+     *  Return status of prospect
+     *
+     *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+     *  @param	string	$label		Label to use for status for added status
+     *  @return string        		Libelle
+     */
+    function getLibProspCommStatut($mode=0, $label='')
+    {
+        return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return label of a given status
-	 *
-	 *  @param	int|string	$statut        	Id or code for prospection status
-	 *  @param  int			$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *  @param	string		$label			Label to use for status for added status
-	 *  @return string       	 			Libelle du statut
-	 */
-	function LibProspCommStatut($statut, $mode=0, $label='')
-	{
+    /**
+     *  Return label of a given status
+     *
+     *  @param	int|string	$statut        	Id or code for prospection status
+     *  @param  int			$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *  @param	string		$label			Label to use for status for added status
+     *  @return string       	 			Libelle du statut
+     */
+    function LibProspCommStatut($statut, $mode=0, $label='')
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('customers');
-
-		if ($mode == 2)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
-			}
-		}
-		if ($mode == 3)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
-			}
-		}
-		if ($mode == 4)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
-			}
-		}
-
-		return "Error, mode/status not found";
-	}
+        global $langs;
+        $langs->load('customers');
+
+        if ($mode == 2)
+        {
+            if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+            elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+            elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+            elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+            elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+            else
+            {
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
+            }
+        }
+        if ($mode == 3)
+        {
+            if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
+            elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
+            elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
+            elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
+            elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
+            else
+            {
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
+            }
+        }
+        if ($mode == 4)
+        {
+            if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+            elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+            elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+            elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+            elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+            else
+            {
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
+            }
+        }
+
+        return "Error, mode/status not found";
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set outstanding value
-	 *
-	 *  @param  User	$user		User making change
-	 *	@return	int					<0 if KO, >0 if OK
-	 * @deprecated Use update function instead
-	 */
-	function set_OutstandingBill(User $user)
-	{
+    /**
+     *  Set outstanding value
+     *
+     *  @param  User	$user		User making change
+     *	@return	int					<0 if KO, >0 if OK
+     * @deprecated Use update function instead
+     */
+    function set_OutstandingBill(User $user)
+    {
         // phpcs:enable
-		return $this->update($this->id, $user);
-	}
-
-	/**
-	 *  Return amount of order not paid and total
-	 *
-	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
-	 */
-	function getOutstandingProposals($mode='customer')
-	{
-		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
-
-		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		if ($mode == 'supplier') {
-			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
-		} else {
-			$sql .= " AND entity IN (".getEntity('propal').")";
-		}
-
-		dol_syslog("getOutstandingProposals", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingOpened = 0;
-			$outstandingTotal = 0;
-			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
-				{
-					$outstandingOpened+=$obj->total_ttc;
-				}
-			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
-			return array();
-	}
-
-	/**
-	 *  Return amount of order not paid and total
-	 *
-	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
-	 */
-	function getOutstandingOrders($mode='customer')
-	{
-		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
-
-		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		if ($mode == 'supplier') {
-			$sql .= " AND entity IN (".getEntity('supplier_order').")";
-		} else {
-			$sql .= " AND entity IN (".getEntity('commande').")";
-		}
-
-		dol_syslog("getOutstandingOrders", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingOpened = 0;
-			$outstandingTotal = 0;
-			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
-				{
-					$outstandingOpened+=$obj->total_ttc;
-				}
-			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
-			return array();
-	}
-
-	/**
-	 *  Return amount of bill not paid and total
-	 *
-	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
-	 */
-	function getOutstandingBills($mode='customer')
-	{
-		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
-
-		/* Accurate value of remain to pay is to sum remaintopay for each invoice
+        return $this->update($this->id, $user);
+    }
+
+    /**
+     *  Return amount of order not paid and total
+     *
+     *  @param     string      $mode    'customer' or 'supplier'
+     *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
+     */
+    function getOutstandingProposals($mode='customer')
+    {
+        $table='propal';
+        if ($mode == 'supplier') $table = 'supplier_proposal';
+
+        $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        if ($mode == 'supplier') {
+            $sql .= " AND entity IN (".getEntity('supplier_proposal').")";
+        } else {
+            $sql .= " AND entity IN (".getEntity('propal').")";
+        }
+
+        dol_syslog("getOutstandingProposals", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingOpened = 0;
+            $outstandingTotal = 0;
+            $outstandingTotalIncTax = 0;
+            while($obj=$this->db->fetch_object($resql)) {
+                $outstandingTotal+= $obj->total_ht;
+                $outstandingTotalIncTax+= $obj->total_ttc;
+                if ($obj->fk_statut != 0)    // Not a draft
+                {
+                    $outstandingOpened+=$obj->total_ttc;
+                }
+            }
+            return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+        }
+        else
+            return array();
+    }
+
+    /**
+     *  Return amount of order not paid and total
+     *
+     *  @param     string      $mode    'customer' or 'supplier'
+     *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+     */
+    function getOutstandingOrders($mode='customer')
+    {
+        $table='commande';
+        if ($mode == 'supplier') $table = 'commande_fournisseur';
+
+        $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        if ($mode == 'supplier') {
+            $sql .= " AND entity IN (".getEntity('supplier_order').")";
+        } else {
+            $sql .= " AND entity IN (".getEntity('commande').")";
+        }
+
+        dol_syslog("getOutstandingOrders", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingOpened = 0;
+            $outstandingTotal = 0;
+            $outstandingTotalIncTax = 0;
+            while($obj=$this->db->fetch_object($resql)) {
+                $outstandingTotal+= $obj->total_ht;
+                $outstandingTotalIncTax+= $obj->total_ttc;
+                if ($obj->fk_statut != 0)    // Not a draft
+                {
+                    $outstandingOpened+=$obj->total_ttc;
+                }
+            }
+            return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+        }
+        else
+            return array();
+    }
+
+    /**
+     *  Return amount of bill not paid and total
+     *
+     *  @param     string      $mode    'customer' or 'supplier'
+     *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+     */
+    function getOutstandingBills($mode='customer')
+    {
+        $table='facture';
+        if ($mode == 'supplier') $table = 'facture_fourn';
+
+        /* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
 		 $creditnotes=$invoice->getSumCreditNotesUsed();
 		 $deposits=$invoice->getSumDepositsUsed();
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		if ($mode == 'supplier') {
-			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
-		} else {
-			$sql .= " AND entity IN (".getEntity('invoice').")";
-		}
-
-		dol_syslog("getOutstandingBills", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingOpened = 0;
-			$outstandingTotal = 0;
-			$outstandingTotalIncTax = 0;
-			if ($mode == 'supplier')
-			{
-				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
-			{
-				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$tmpobject=new Facture($this->db);
-			}
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
-				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
-					)
-				{
-					$outstandingTotal+= $obj->total_ht;
-					$outstandingTotalIncTax+= $obj->total_ttc;
-				}
-				if ($obj->paye == 0
-					&& $obj->fk_statut != 0    // Not a draft
-					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
-				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-				{
-					$paiement = $tmpobject->getSommePaiement();
-					$creditnotes = $tmpobject->getSumCreditNotesUsed();
-					$deposits = $tmpobject->getSumDepositsUsed();
-					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
-				}
-			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
-		{
-			return array();
-		}
-	}
+        if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+        else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        if ($mode == 'supplier') {
+            $sql .= " AND entity IN (".getEntity('facture_fourn').")";
+        } else {
+            $sql .= " AND entity IN (".getEntity('invoice').")";
+        }
+
+        dol_syslog("getOutstandingBills", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingOpened = 0;
+            $outstandingTotal = 0;
+            $outstandingTotalIncTax = 0;
+            if ($mode == 'supplier')
+            {
+                require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+                $tmpobject=new FactureFournisseur($this->db);
+            }
+            else
+            {
+                require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+                $tmpobject=new Facture($this->db);
+            }
+            while($obj=$this->db->fetch_object($resql)) {
+                $tmpobject->id=$obj->rowid;
+                if ($obj->fk_statut != 0                                           // Not a draft
+                    && ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+                    )
+                {
+                    $outstandingTotal+= $obj->total_ht;
+                    $outstandingTotalIncTax+= $obj->total_ttc;
+                }
+                if ($obj->paye == 0
+                    && $obj->fk_statut != 0    // Not a draft
+                    && $obj->fk_statut != 3	   // Not abandonned
+                    && $obj->fk_statut != 2)   // Not classified as paid
+                //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+                {
+                    $paiement = $tmpobject->getSommePaiement();
+                    $creditnotes = $tmpobject->getSumCreditNotesUsed();
+                    $deposits = $tmpobject->getSumDepositsUsed();
+                    $outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+                }
+            }
+            return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+        }
+        else
+        {
+            return array();
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return amount of bill not paid
-	 *
-	 *  @return		int				Amount in debt for thirdparty
-	 *  @deprecated
-	 *  @see getOutstandingBills()
-	 */
-	function get_OutstandingBill()
-	{
+    /**
+     *  Return amount of bill not paid
+     *
+     *  @return		int				Amount in debt for thirdparty
+     *  @deprecated
+     *  @see getOutstandingBills()
+     */
+    function get_OutstandingBill()
+    {
         // phpcs:enable
-		/* Accurate value of remain to pay is to sum remaintopay for each invoice
+        /* Accurate value of remain to pay is to sum remaintopay for each invoice
 	     $paiement = $invoice->getSommePaiement();
 	     $creditnotes=$invoice->getSumCreditNotesUsed();
 	     $deposits=$invoice->getSumDepositsUsed();
 	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
-		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
-		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
-
-		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingAmount = 0;
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$tmpobject=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
-				$paiement = $tmpobject->getSommePaiement();
-				$creditnotes = $tmpobject->getSumCreditNotesUsed();
-				$deposits = $tmpobject->getSumDepositsUsed();
-				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
-			}
-			return $outstandingAmount;
-		}
-		else
-			return 0;
-	}
-
-	/**
-	 * Return label of status customer is prospect/customer
-	 *
-	 * @return   string        	Label
-	 */
-	function getLibCustProspStatut()
-	{
-		return $this->LibCustProspStatut($this->client);
-	}
+        $sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        $sql .= " AND paye = 0";
+        $sql .= " AND fk_statut <> 0";	// Not a draft
+        //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+        $sql .= " AND fk_statut <> 3";		// Not abandonned
+        $sql .= " AND fk_statut <> 2";		// Not clasified as paid
+
+        dol_syslog("get_OutstandingBill", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingAmount = 0;
+            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            $tmpobject=new Facture($this->db);
+            while($obj=$this->db->fetch_object($resql)) {
+                $tmpobject->id=$obj->rowid;
+                $paiement = $tmpobject->getSommePaiement();
+                $creditnotes = $tmpobject->getSumCreditNotesUsed();
+                $deposits = $tmpobject->getSumDepositsUsed();
+                $outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+            }
+            return $outstandingAmount;
+        }
+        else
+            return 0;
+    }
+
+    /**
+     * Return label of status customer is prospect/customer
+     *
+     * @return   string        	Label
+     */
+    function getLibCustProspStatut()
+    {
+        return $this->LibCustProspStatut($this->client);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Renvoi le libelle d'un statut donne
-	 *
-	 *  @param	int		$statut         Id statut
-	 *  @return	string          		Libelle du statut
-	 */
-	function LibCustProspStatut($statut)
-	{
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *
+     *  @param	int		$statut         Id statut
+     *  @return	string          		Libelle du statut
+     */
+    function LibCustProspStatut($statut)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('companies');
-
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
-	}
-
-
-	/**
-	 *  Create a document onto disk according to template module.
-	 *
-	 *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.
-	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
-	 *  @param  int			$hidedetails    Hide details of lines
-	 *  @param  int			$hidedesc       Hide description
-	 *  @param  int			$hideref        Hide ref
-	 *  @param  null|array  $moreparams     Array to provide more information
-	 *	@return int        					<0 if KO, >0 if OK
-	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
-	{
-		global $conf,$user,$langs;
-
-		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
-		{
-			$modelpath = "core/modules/bank/doc/";
-
-			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-			$companybankaccount = new CompanyBankAccount($this->db);
-			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
-		{
-			// Positionne le modele sur le nom du modele a utiliser
-			if (! dol_strlen($modele))
-			{
-				if (! empty($conf->global->COMPANY_ADDON_PDF))
-				{
-					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
-				{
-					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
-					return 0;
-				}
-			}
-
-			$modelpath = "core/modules/societe/doc/";
-
-			$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-
-		return $result;
-	}
-
-
-	/**
-	 * Sets object to supplied categories.
-	 *
-	 * Deletes object from existing categories not supplied.
-	 * Adds it to non existing supplied categories.
-	 * Existing categories are left untouch.
-	 *
-	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
-	 * @param 	string 		$type 			Category type ('customer' or 'supplier')
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	public function setCategories($categories, $type)
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-
-		// Decode type
-		if ($type == 'customer') {
-			$type_id = Categorie::TYPE_CUSTOMER;
-			$type_text = 'customer';
-		} elseif ($type == 'supplier') {
-			$type_id = Categorie::TYPE_SUPPLIER;
-			$type_text = 'supplier';
-		} else {
-			dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
-			return -1;
-		}
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_id, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		$error = 0;
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_text);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
-				$result = $c->add_type($this, $type_text);
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $c->error;
-					$this->errors = $c->errors;
-					break;
-				}
-			}
-		}
-
-		return $error ? -1 : 1;
-	}
-
-	/**
-	 * Sets sales representatives of the thirdparty
-	 *
-	 * @param 	int[]|int 	$salesrep	 	User ID or array of user IDs
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	public function setSalesRep($salesrep)
-	{
-		global $user;
-
-		// Handle single user
-		if (!is_array($salesrep)) {
-			$salesrep = array($salesrep);
-		}
-
-		// Get current users
-		$existing = $this->getSalesRepresentatives($user, 1);
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $salesrep);
-			$to_add = array_diff($salesrep, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $salesrep;
-		}
-
-		$error = 0;
-
-		// Process
-		foreach ($to_del as $del) {
-			$this->del_commercial($user, $del);
-		}
-		foreach ($to_add as $add) {
-			$result = $this->add_commercial($user, $add);
-			if ($result < 0)
-			{
-				$error++;
-				$this->error = $c->error;
-				$this->errors = $c->errors;
-				break;
-			}
-		}
-
-		return $error ? -1 : 1;
-	}
-
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 * It must be used within a transaction to avoid trouble
-	 *
-	 * @param 	DoliDB 	$db 		Database handler
-	 * @param 	int 	$origin_id 	Old thirdparty id (will be removed)
-	 * @param 	int 	$dest_id 	New thirdparty id
-	 * @return 	bool				True if success, False if error
-	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-	{
-		if ($origin_id == $dest_id)
-		{
-			dol_syslog('Error: Try to merge a thirdparty into itself');
-			return false;
-		}
-
-		/**
-		 * Thirdparty commercials cannot be the same in both thirdparties so we look for them and remove some to avoid duplicate.
-		 * Because this function is meant to be executed within a transaction, we won't take care of begin/commit.
-		 */
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
-		$sql .= ' WHERE fk_soc = '.(int) $dest_id.' AND fk_user IN ( ';
-		$sql .= ' SELECT fk_user ';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
-		$sql .= ' WHERE fk_soc = '.(int) $origin_id.') ';
+        global $langs;
+        $langs->load('companies');
 
-		$query = $db->query($sql);
+        if ($statut==0) return $langs->trans("NorProspectNorCustomer");
+        if ($statut==1) return $langs->trans("Customer");
+        if ($statut==2) return $langs->trans("Prospect");
+        if ($statut==3) return $langs->trans("ProspectCustomer");
+    }
 
-		while ($result = $db->fetch_object($query)) {
-			$db->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.$result->rowid);
-		}
 
-		/**
-		 * llx_societe_extrafields table must not be here because we don't care about the old thirdparty data
-		 * Do not include llx_societe because it will be replaced later
-		 */
-		$tables = array(
-			'societe_address',
-			'societe_commerciaux',
-			'societe_log',
-			'societe_prices',
-			'societe_remise',
-			'societe_remise_except',
-			'societe_rib'
-		);
-
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-	}
+    /**
+     *  Create a document onto disk according to template module.
+     *
+     *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.
+     *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
+     *  @param  int			$hidedetails    Hide details of lines
+     *  @param  int			$hidedesc       Hide description
+     *  @param  int			$hideref        Hide ref
+     *  @param  null|array  $moreparams     Array to provide more information
+     *	@return int        					<0 if KO, >0 if OK
+     */
+    public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+    {
+        global $conf,$user,$langs;
+
+        if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
+        {
+            $modelpath = "core/modules/bank/doc/";
+
+            include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+            $companybankaccount = new CompanyBankAccount($this->db);
+            $result = $companybankaccount->fetch($moreparams['use_companybankid']);
+            if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+            $result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        }
+        else
+        {
+            // Positionne le modele sur le nom du modele a utiliser
+            if (! dol_strlen($modele))
+            {
+                if (! empty($conf->global->COMPANY_ADDON_PDF))
+                {
+                    $modele = $conf->global->COMPANY_ADDON_PDF;
+                }
+                else
+                {
+                    print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
+                    return 0;
+                }
+            }
+
+            $modelpath = "core/modules/societe/doc/";
+
+            $result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Sets object to supplied categories.
+     *
+     * Deletes object from existing categories not supplied.
+     * Adds it to non existing supplied categories.
+     * Existing categories are left untouch.
+     *
+     * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
+     * @param 	string 		$type 			Category type ('customer' or 'supplier')
+     * @return	int							<0 if KO, >0 if OK
+     */
+    public function setCategories($categories, $type)
+    {
+        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+
+        // Decode type
+        if ($type == 'customer') {
+            $type_id = Categorie::TYPE_CUSTOMER;
+            $type_text = 'customer';
+        } elseif ($type == 'supplier') {
+            $type_id = Categorie::TYPE_SUPPLIER;
+            $type_text = 'supplier';
+        } else {
+            dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
+            return -1;
+        }
+
+        // Handle single category
+        if (!is_array($categories)) {
+            $categories = array($categories);
+        }
+
+        // Get current categories
+        $c = new Categorie($this->db);
+        $existing = $c->containing($this->id, $type_id, 'id');
+
+        // Diff
+        if (is_array($existing)) {
+            $to_del = array_diff($existing, $categories);
+            $to_add = array_diff($categories, $existing);
+        } else {
+            $to_del = array(); // Nothing to delete
+            $to_add = $categories;
+        }
+
+        $error = 0;
+
+        // Process
+        foreach ($to_del as $del) {
+            if ($c->fetch($del) > 0) {
+                $c->del_type($this, $type_text);
+            }
+        }
+        foreach ($to_add as $add) {
+            if ($c->fetch($add) > 0)
+            {
+                $result = $c->add_type($this, $type_text);
+                if ($result < 0)
+                {
+                    $error++;
+                    $this->error = $c->error;
+                    $this->errors = $c->errors;
+                    break;
+                }
+            }
+        }
+
+        return $error ? -1 : 1;
+    }
+
+    /**
+     * Sets sales representatives of the thirdparty
+     *
+     * @param 	int[]|int 	$salesrep	 	User ID or array of user IDs
+     * @return	int							<0 if KO, >0 if OK
+     */
+    public function setSalesRep($salesrep)
+    {
+        global $user;
+
+        // Handle single user
+        if (!is_array($salesrep)) {
+            $salesrep = array($salesrep);
+        }
+
+        // Get current users
+        $existing = $this->getSalesRepresentatives($user, 1);
+
+        // Diff
+        if (is_array($existing)) {
+            $to_del = array_diff($existing, $salesrep);
+            $to_add = array_diff($salesrep, $existing);
+        } else {
+            $to_del = array(); // Nothing to delete
+            $to_add = $salesrep;
+        }
+
+        $error = 0;
+
+        // Process
+        foreach ($to_del as $del) {
+            $this->del_commercial($user, $del);
+        }
+        foreach ($to_add as $add) {
+            $result = $this->add_commercial($user, $add);
+            if ($result < 0)
+            {
+                $error++;
+                $this->error = $c->error;
+                $this->errors = $c->errors;
+                break;
+            }
+        }
+
+        return $error ? -1 : 1;
+    }
+
+
+    /**
+     * Function used to replace a thirdparty id with another one.
+     * It must be used within a transaction to avoid trouble
+     *
+     * @param 	DoliDB 	$db 		Database handler
+     * @param 	int 	$origin_id 	Old thirdparty id (will be removed)
+     * @param 	int 	$dest_id 	New thirdparty id
+     * @return 	bool				True if success, False if error
+     */
+    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+    {
+        if ($origin_id == $dest_id)
+        {
+            dol_syslog('Error: Try to merge a thirdparty into itself');
+            return false;
+        }
+
+        /**
+         * Thirdparty commercials cannot be the same in both thirdparties so we look for them and remove some to avoid duplicate.
+         * Because this function is meant to be executed within a transaction, we won't take care of begin/commit.
+         */
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
+        $sql .= ' WHERE fk_soc = '.(int) $dest_id.' AND fk_user IN ( ';
+        $sql .= ' SELECT fk_user ';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
+        $sql .= ' WHERE fk_soc = '.(int) $origin_id.') ';
+
+        $query = $db->query($sql);
+
+        while ($result = $db->fetch_object($query)) {
+            $db->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.$result->rowid);
+        }
+
+        /**
+         * llx_societe_extrafields table must not be here because we don't care about the old thirdparty data
+         * Do not include llx_societe because it will be replaced later
+         */
+        $tables = array(
+            'societe_address',
+            'societe_commerciaux',
+            'societe_log',
+            'societe_prices',
+            'societe_remise',
+            'societe_remise_except',
+            'societe_rib'
+        );
+
+        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+    }
 }

Spacing +798 added lines, -798 removed lines

@@ -45,7 +45,7 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='societe';
+	public $element = 'societe';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
@@ -55,11 +55,11 @@ 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element='fk_soc';
+	public $fk_element = 'fk_soc';
 
-	public $fieldsforcombobox='nom,name_alias';
-	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
-	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+	public $fieldsforcombobox = 'nom,name_alias';
+	protected $childtables = array("supplier_proposal"=>'SupplierProposal', "propal"=>'Proposal', "commande"=>'Order', "facture"=>'Invoice', "facture_rec"=>'RecurringInvoiceTemplate', "contrat"=>'Contract', "fichinter"=>'Fichinter', "facture_fourn"=>'SupplierInvoice', "commande_fournisseur"=>'SupplierOrder', "projet"=>'Project', "expedition"=>'Shipment', "prelevement_lignes"=>'DirectDebitRecord'); // To test if we can delete object
+	protected $childtablesoncascade = array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
 	public $picto = 'company';
 
 	/**
@@ -79,20 +79,20 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
-		'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
-		'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		'datec'			=>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
-		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+	public $fields = array(
+		'rowid'         =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+		'note_public'   =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>60),
+		'note_private'  =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>61),
+		'datec'			=>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+		'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
-		'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
+		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1, 'position'=>1000),
 	);
 
 
@@ -134,7 +134,7 @@ 
 	 * Thirdparty status : 0=activity ceased, 1= in activity
 	 * @var int
 	 */
-	public $status=1;
+	public $status = 1;
 
 	/**
 	 * Id of department
@@ -256,7 +256,7 @@ 
 
 	public $prefix_comm;
 
-	public $tva_assuj=1;
+	public $tva_assuj = 1;
 	/**
 	 * Intracommunitary VAT ID
 	 * @var string
@@ -271,12 +271,12 @@ 
 
 	public $managers;
 	public $capital;
-	public $typent_id=0;
+	public $typent_id = 0;
 	public $typent_code;
 	public $effectif;
-	public $effectif_id=0;
+	public $effectif_id = 0;
 	public $forme_juridique_code;
-	public $forme_juridique=0;
+	public $forme_juridique = 0;
 
 	public $remise_percent;
 	public $remise_supplier_percent;
@@ -320,12 +320,12 @@ 
 	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
 	 * @var int
 	 */
-	public $client=0;
+	public $client = 0;
 	/**
 	 * 0=no prospect, 1=prospect
 	 * @var int
 	 */
-	public $prospect=0;
+	public $prospect = 0;
 	/**
 	 * 0=no supplier, 1=supplier
 	 * @var int
@@ -461,7 +461,7 @@ 
 	public $fk_incoterms;
 
 	public $location_incoterms;
-	public $libelle_incoterms;  //Used into tooltip
+	public $libelle_incoterms; //Used into tooltip
 
 	// Multicurrency
 	/**
@@ -487,9 +487,9 @@ 
 		$this->client = 0;
 		$this->prospect = 0;
 		$this->fournisseur = 0;
-		$this->typent_id  = 0;
-		$this->effectif_id  = 0;
-		$this->forme_juridique_code  = 0;
+		$this->typent_id = 0;
+		$this->effectif_id = 0;
+		$this->forme_juridique_code = 0;
 		$this->tva_assuj = 1;
 		$this->status = 1;
 	}
@@ -504,17 +504,17 @@ 
 	 */
 	function create(User $user)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
-		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->status)) $this->status = 0;
+		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
+		$this->nom = $this->name; // For backward compatibility
+		if (empty($this->client))      $this->client = 0;
+		if (empty($this->fournisseur)) $this->fournisseur = 0;
 		$this->import_key = trim($this->import_key);
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -526,13 +526,13 @@ 
 
 		dol_syslog(get_class($this)."::create ".$this->name);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -540,29 +540,29 @@ 
 
 		if ($result >= 0)
 		{
-			$this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-			$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
-			$sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-			$sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-			$sql.= ", ".$this->status;
-			$sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-			$sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-			$sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-			$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-			$sql.= ", ".(int) $this->fk_multicurrency;
-			$sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
+			$sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+			$sql .= ", ".(!empty($user->id) ? "'".$user->id."'" : "null");
+			$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
+			$sql .= ", ".$this->status;
+			$sql .= ", ".(!empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'" : "null");
+			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ", 0";
+			$sql .= ", ".(int) $this->fk_incoterms;
+			$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+			$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+			$sql .= ", ".(int) $this->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$result=$this->db->query($sql);
+			$result = $this->db->query($sql);
 			if ($result)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
-				$ret = $this->update($this->id,$user,0,1,1,'add');
+				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
 				// Ajout du commercial affecte
 				if ($this->commercial_id != '' && $this->commercial_id != -1)
@@ -578,13 +578,13 @@ 
 				if ($ret >= 0)
 				{
 					// Call trigger
-					$result=$this->call_trigger('COMPANY_CREATE',$user);
+					$result = $this->call_trigger('COMPANY_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 				}
 				else $error++;
 
-				if (! $error)
+				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
@@ -592,7 +592,7 @@ 
 				}
 				else
 				{
-					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
@@ -601,13 +601,13 @@ 
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-					$result=-1;
+					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
+					$result = -1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
-					$result=-2;
+					$this->error = $this->db->lasterror();
+					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
@@ -616,7 +616,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
 		}
 	}
@@ -633,12 +633,12 @@ 
 	{
         // phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		$contact=new Contact($this->db);
+		$contact = new Contact($this->db);
 
 		$contact->name              = $this->name_bis;
 		$contact->firstname         = $this->firstname;
 		$contact->civility_id       = $this->civility_id;
-		$contact->socid             = $this->id;	// fk_soc
+		$contact->socid             = $this->id; // fk_soc
 		$contact->statut            = 1;
 		$contact->priv              = 0;
 		$contact->country_id        = $this->country_id;
@@ -654,7 +654,7 @@ 
 		{
 			$this->error = $contact->error;
 			$this->errors = $contact->errors;
-			dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
 		}
 
 		return $result;
@@ -671,13 +671,13 @@ 
 		global $conf, $langs, $mysoc;
 
 		$error = 0;
-		$this->errors=array();
+		$this->errors = array();
 
 		$result = 0;
-		$this->name	= trim($this->name);
-		$this->nom=$this->name; // For backward compatibility
+		$this->name = trim($this->name);
+		$this->nom = $this->name; // For backward compatibility
 
-		if (! $this->name)
+		if (!$this->name)
 		{
 			$this->errors[] = 'ErrorBadThirdPartyName';
 			$result = -2;
@@ -734,12 +734,12 @@ 
 		}
 
 		// Check for duplicate or mandatory fields defined into setup
-		$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-		foreach($array_to_check as $key)
+		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+		foreach ($array_to_check as $key)
 		{
-			$keymin=strtolower($key);
-			$i=(int) preg_replace('/[^0-9]/','',$key);
-			$vallabel=$this->$keymin;
+			$keymin = strtolower($key);
+			$i = (int) preg_replace('/[^0-9]/', '', $key);
+			$vallabel = $this->$keymin;
 
 			if ($i > 0)
 			{
@@ -758,8 +758,8 @@ 
 					// Check for mandatory prof id (but only if country is other than ours)
 					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
 					{
-						$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-						if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+						$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
+						if (!$vallabel && !empty($conf->global->$idprof_mandatory))
 						{
 							$langs->load("errors");
 							$error++;
@@ -775,7 +775,7 @@ 
 				if ($key == 'EMAIL')
 				{
 					// Check for unicity
-					if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
+					if ($vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE))
 					{
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
 						{
@@ -785,7 +785,7 @@ 
 					}
 
 					// Check for mandatory
-					if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email))
 					{
 						$langs->load("errors");
 						$error++;
@@ -812,58 +812,58 @@ 
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
 	 *      @return int  			           			<0 if KO, >=0 if OK
 	 */
-	function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+	function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
-		global $langs,$conf,$hookmanager;
+		global $langs, $conf, $hookmanager;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		if (empty($id)) $id = $this->id;
 
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Clean parameters
-		$this->id			= $id;
-		$this->entity		= ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
-		$this->name			= $this->name?trim($this->name):trim($this->nom);
-		$this->nom			= $this->name;	// For backward compatibility
-		$this->name_alias	= trim($this->name_alias);
+		$this->id = $id;
+		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		$this->nom = $this->name; // For backward compatibility
+		$this->name_alias = trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address?trim($this->address):trim($this->address);
-		$this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-		$this->town			= $this->town?trim($this->town):trim($this->town);
-		$this->state_id		= trim($this->state_id);
-		$this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+		$this->address		= $this->address ?trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
+		$this->town			= $this->town ?trim($this->town) : trim($this->town);
+		$this->state_id = trim($this->state_id);
+		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
-		$this->phone		= preg_replace("/\s/","",$this->phone);
-		$this->phone		= preg_replace("/\./","",$this->phone);
+		$this->phone		= preg_replace("/\s/", "", $this->phone);
+		$this->phone		= preg_replace("/\./", "", $this->phone);
 		$this->fax			= trim($this->fax);
-		$this->fax			= preg_replace("/\s/","",$this->fax);
-		$this->fax			= preg_replace("/\./","",$this->fax);
+		$this->fax			= preg_replace("/\s/", "", $this->fax);
+		$this->fax			= preg_replace("/\./", "", $this->fax);
 		$this->email		= trim($this->email);
 		$this->skype		= trim($this->skype);
-		$this->twitter		= trim($this->twitter);
-		$this->facebook		= trim($this->facebook);
-		$this->url			= $this->url?clean_url($this->url,0):'';
+		$this->twitter = trim($this->twitter);
+		$this->facebook = trim($this->facebook);
+		$this->url = $this->url ?clean_url($this->url, 0) : '';
 		$this->note_private = trim($this->note_private);
 		$this->note_public  = trim($this->note_public);
 		$this->idprof1		= trim($this->idprof1);
 		$this->idprof2		= trim($this->idprof2);
 		$this->idprof3		= trim($this->idprof3);
 		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-		$this->prefix_comm	= trim($this->prefix_comm);
+		$this->idprof5		= (!empty($this->idprof5) ?trim($this->idprof5) : '');
+		$this->idprof6		= (!empty($this->idprof6) ?trim($this->idprof6) : '');
+		$this->prefix_comm = trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
 		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
 
 		$this->tva_assuj	= trim($this->tva_assuj);
-		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra, '');
 		if (empty($this->status)) $this->status = 0;
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -874,64 +874,64 @@ 
 		}
 
 		// Local taxes
-		$this->localtax1_assuj=trim($this->localtax1_assuj);
-		$this->localtax2_assuj=trim($this->localtax2_assuj);
+		$this->localtax1_assuj = trim($this->localtax1_assuj);
+		$this->localtax2_assuj = trim($this->localtax2_assuj);
 
-		$this->localtax1_value=trim($this->localtax1_value);
-		$this->localtax2_value=trim($this->localtax2_value);
+		$this->localtax1_value = trim($this->localtax1_value);
+		$this->localtax2_value = trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') $this->capital = price2num(trim($this->capital));
+		if (!is_numeric($this->capital)) $this->capital = ''; // '' = undef
 
-		$this->effectif_id=trim($this->effectif_id);
-		$this->forme_juridique_code=trim($this->forme_juridique_code);
+		$this->effectif_id = trim($this->effectif_id);
+		$this->forme_juridique_code = trim($this->forme_juridique_code);
 
 		//Gencod
-		$this->barcode=trim($this->barcode);
+		$this->barcode = trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
 
-		$this->code_compta=trim($this->code_compta);
-		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+		$this->code_compta = trim($this->code_compta);
+		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
-		if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+		if (!is_numeric($this->client) && !is_numeric($this->fournisseur))
 		{
 			$langs->load("errors");
 			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
 			return -1;
 		}
 
-		$customer=false;
-		if (! empty($allowmodcodeclient) && ! empty($this->client))
+		$customer = false;
+		if (!empty($allowmodcodeclient) && !empty($this->client))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
 			if (empty($this->code_compta))
 			{
-				$ret=$this->get_codecompta('customer');
+				$ret = $this->get_codecompta('customer');
 				if ($ret < 0) return -1;
 			}
 
-			$customer=true;
+			$customer = true;
 		}
 
-		$supplier=false;
-		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+		$supplier = false;
+		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
 			if (empty($this->code_compta_fournisseur))
 			{
-				$ret=$this->get_codecompta('supplier');
+				$ret = $this->get_codecompta('supplier');
 				if ($ret < 0) return -1;
 			}
 
-			$supplier=true;
+			$supplier = true;
 		}
 
 		//Web services
-		$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+		$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
 		$this->webservices_key = trim($this->webservices_key);
 
 		//Incoterms
@@ -955,11 +955,11 @@ 
 			{
 				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
 				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
 				}
 				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
 				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
 				}
 				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
 				{
@@ -973,118 +973,118 @@ 
 			dol_syslog(get_class($this)."::update verify ok or not done");
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-			$sql .= "entity = " . $this->db->escape($this->entity);
-			$sql .= ",nom = '" . $this->db->escape($this->name) ."'"; // Required
-			$sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-			$sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-			$sql .= ",address = '" . $this->db->escape($this->address) ."'";
-
-			$sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-			$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
-
-			$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-			$sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
-
-			$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-			$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-			$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-			$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-			$sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
-			$sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
-			$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
-
-			$sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
-
-			$sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-			$sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-
-			$sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-			$sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-			$sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-			$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-			$sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-			$sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
-
-			$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-			$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-			$sql .= ",status = " .$this->status;
+			$sql .= "entity = ".$this->db->escape($this->entity);
+			$sql .= ",nom = '".$this->db->escape($this->name)."'"; // Required
+			$sql .= ",name_alias = '".$this->db->escape($this->name_alias)."'";
+			$sql .= ",ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ",address = '".$this->db->escape($this->address)."'";
+
+			$sql .= ",zip = ".(!empty($this->zip) ? "'".$this->db->escape($this->zip)."'" : "null");
+			$sql .= ",town = ".(!empty($this->town) ? "'".$this->db->escape($this->town)."'" : "null");
+
+			$sql .= ",fk_departement = '".(!empty($this->state_id) ? $this->state_id : '0')."'";
+			$sql .= ",fk_pays = '".(!empty($this->country_id) ? $this->country_id : '0')."'";
+
+			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
+			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
+			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+			$sql .= ",skype = ".(!empty($this->skype) ? "'".$this->db->escape($this->skype)."'" : "null");
+			$sql .= ",twitter = ".(!empty($this->twitter) ? "'".$this->db->escape($this->twitter)."'" : "null");
+			$sql .= ",facebook = ".(!empty($this->facebook) ? "'".$this->db->escape($this->facebook)."'" : "null");
+			$sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
+
+			$sql .= ",parent = ".($this->parent > 0 ? $this->parent : "null");
+
+			$sql .= ",note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+			$sql .= ",note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+
+			$sql .= ",siren   = '".$this->db->escape($this->idprof1)."'";
+			$sql .= ",siret   = '".$this->db->escape($this->idprof2)."'";
+			$sql .= ",ape     = '".$this->db->escape($this->idprof3)."'";
+			$sql .= ",idprof4 = '".$this->db->escape($this->idprof4)."'";
+			$sql .= ",idprof5 = '".$this->db->escape($this->idprof5)."'";
+			$sql .= ",idprof6 = '".$this->db->escape($this->idprof6)."'";
+
+			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
+			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
+			$sql .= ",status = ".$this->status;
 
 			// Local taxes
-			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-			if($this->localtax1_assuj==1)
+			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
+			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
+			if ($this->localtax1_assuj == 1)
 			{
-				if($this->localtax1_value!='')
+				if ($this->localtax1_value != '')
 				{
-					$sql .=",localtax1_value =".$this->localtax1_value;
+					$sql .= ",localtax1_value =".$this->localtax1_value;
 				}
-				else $sql .=",localtax1_value =0.000";
+				else $sql .= ",localtax1_value =0.000";
 			}
-			else $sql .=",localtax1_value =0.000";
+			else $sql .= ",localtax1_value =0.000";
 
-			if($this->localtax2_assuj==1)
+			if ($this->localtax2_assuj == 1)
 			{
-				if($this->localtax2_value!='')
+				if ($this->localtax2_value != '')
 				{
-					$sql .=",localtax2_value =".$this->localtax2_value;
+					$sql .= ",localtax2_value =".$this->localtax2_value;
 				}
-				else $sql .=",localtax2_value =0.000";
+				else $sql .= ",localtax2_value =0.000";
 			}
-			else $sql .=",localtax2_value =0.000";
+			else $sql .= ",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
-			$sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
-			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+			$sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
 			if (isset($this->stcomm_id))
 			{
-				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
+				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
 			}
-			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
-
-			$sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
-
-			$sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-			$sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-			$sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-			$sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-			$sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
-
-			$sql .= ",client = " . (! empty($this->client)?$this->client:0);
-			$sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
-			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
+			$sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
+
+			$sql .= ",fk_forme_juridique = ".(!empty($this->forme_juridique_code) ? "'".$this->db->escape($this->forme_juridique_code)."'" : "null");
+
+			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
+			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+			$sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
+
+			$sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
+			$sql .= ",fournisseur = ".(!empty($this->fournisseur) ? $this->fournisseur : 0);
+			$sql .= ",barcode = ".(!empty($this->barcode) ? "'".$this->db->escape($this->barcode)."'" : "null");
+			$sql .= ",default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
+			$sql .= ",logo = ".(!empty($this->logo) ? "'".$this->db->escape($this->logo)."'" : "null");
+			$sql .= ",outstanding_limit= ".($this->outstanding_limit != '' ? $this->outstanding_limit : 'null');
+			$sql .= ",order_min_amount= ".($this->order_min_amount != '' ? $this->order_min_amount : 'null');
+			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
-			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-			$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+			$sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
+			$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
 			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
+			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
 			if ($customer)
 			{
-				$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-				$sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
+				$sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
 			}
 
 			if ($supplier)
 			{
-				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+				$sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
+				$sql .= ", code_compta_fournisseur = ".(!empty($this->code_compta_fournisseur) ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
 			}
-			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
+			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : "null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
 			$sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
-			$sql .= " WHERE rowid = " . (int) $id;
+			$sql .= " WHERE rowid = ".(int) $id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				if (is_object($this->oldcopy))	// If we have information on old values
@@ -1102,7 +1102,7 @@ 
 				}
 				else
 				{
-					unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
+					unset($this->country_code); // We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
 					unset($this->state_code);
 					unset($this->state);
@@ -1110,67 +1110,67 @@ 
 
 				$nbrowsaffected = $this->db->affected_rows($resql);
 
-				if (! $error && $nbrowsaffected)
+				if (!$error && $nbrowsaffected)
 				{
 					// Update information on linked member if it is an update
-					if (! $nosyncmember && ! empty($conf->adherent->enabled))
+					if (!$nosyncmember && !empty($conf->adherent->enabled))
 					{
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
 
-						$lmember=new Adherent($this->db);
-						$result=$lmember->fetch(0, 0, $this->id);
+						$lmember = new Adherent($this->db);
+						$result = $lmember->fetch(0, 0, $this->id);
 
 						if ($result > 0)
 						{
-							$lmember->societe=$this->name;
+							$lmember->societe = $this->name;
 							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
 							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-							$lmember->address=$this->address;
-							$lmember->email=$this->email;
-							$lmember->skype=$this->skype;
-							$lmember->twitter=$this->twitter;
-							$lmember->facebook=$this->facebook;
-							$lmember->phone=$this->phone;
-
-							$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+							$lmember->address = $this->address;
+							$lmember->email = $this->email;
+							$lmember->skype = $this->skype;
+							$lmember->twitter = $this->twitter;
+							$lmember->facebook = $this->facebook;
+							$lmember->phone = $this->phone;
+
+							$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
 							if ($result < 0)
 							{
-								$this->error=$lmember->error;
-								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+								$this->error = $lmember->error;
+								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
 						}
 						elseif ($result < 0)
 						{
-							$this->error=$lmember->error;
+							$this->error = $lmember->error;
 							$error++;
 						}
 					}
 				}
 
-				$action='update';
+				$action = 'update';
 
 				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					$result=$this->insertExtraFields();
+					$result = $this->insertExtraFields();
 					if ($result < 0)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && $call_trigger)
+				if (!$error && $call_trigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('COMPANY_MODIFY',$user);
+					$result = $this->call_trigger('COMPANY_MODIFY', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
@@ -1202,7 +1202,7 @@ 
 		else
 	   {
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
 		}
 	}
@@ -1224,7 +1224,7 @@ 
 	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
 	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
+	function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
 	{
 		global $langs;
 		global $conf;
@@ -1279,13 +1279,13 @@ 
 		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
 		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			if ($num > 1)
 			{
-				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+				$this->error = 'Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
 			}
@@ -1295,11 +1295,11 @@ 
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
-				$this->canvas		= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->ref          = $obj->rowid;
-				$this->name 		= $obj->name;
-				$this->nom          = $obj->name;		// deprecated
+				$this->name = $obj->name;
+				$this->nom          = $obj->name; // deprecated
 				$this->name_alias = $obj->name_alias;
 				$this->ref_ext      = $obj->ref_ext;
 				$this->ref_int      = $obj->ref_int;
@@ -1309,22 +1309,22 @@ 
 				$this->user_creation     = $obj->fk_user_creat;
 				$this->user_modification = $obj->fk_user_modif;
 
-				$this->address 		= $obj->address;
+				$this->address = $obj->address;
 				$this->zip 			= $obj->zip;
 				$this->town 		= $obj->town;
 
 				$this->country_id   = $obj->country_id;
-				$this->country_code = $obj->country_id?$obj->country_code:'';
-				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
 				$this->state_id     = $obj->fk_departement;
 				$this->state_code   = $obj->state_code;
-				$this->state        = ($obj->state!='-'?$obj->state:'');
+				$this->state        = ($obj->state != '-' ? $obj->state : '');
 
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-				$this->statut_commercial = $libelle;    // libelle statut commercial
+				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);
+				$libelle = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
+				$this->stcomm_id = $obj->fk_stcomm; // id statut commercial
+				$this->statut_commercial = $libelle; // libelle statut commercial
 
 				$this->email = $obj->email;
 				$this->skype = $obj->skype;
@@ -1334,7 +1334,7 @@ 
 				$this->phone = $obj->phone;
 				$this->fax = $obj->fax;
 
-				$this->parent    = $obj->parent;
+				$this->parent = $obj->parent;
 
 				$this->idprof1		= $obj->idprof1;
 				$this->idprof2		= $obj->idprof2;
@@ -1343,7 +1343,7 @@ 
 				$this->idprof5		= $obj->idprof5;
 				$this->idprof6		= $obj->idprof6;
 
-				$this->capital   = $obj->capital;
+				$this->capital = $obj->capital;
 
 				$this->code_client = $obj->code_client;
 				$this->code_fournisseur = $obj->code_fournisseur;
@@ -1368,23 +1368,23 @@ 
 				$this->typent_code    = $obj->typent_code;
 
 				$this->effectif_id    = $obj->effectif_id;
-				$this->effectif       = $obj->effectif_id?$obj->effectif:'';
+				$this->effectif       = $obj->effectif_id ? $obj->effectif : '';
 
-				$this->forme_juridique_code= $obj->forme_juridique_code;
-				$this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+				$this->forme_juridique_code = $obj->forme_juridique_code;
+				$this->forme_juridique     = $obj->forme_juridique_code ? $obj->forme_juridique : '';
 
 				$this->fk_prospectlevel = $obj->fk_prospectlevel;
 
 				$this->prefix_comm = $obj->prefix_comm;
 
-				$this->remise_percent		= $obj->remise_client;
-				$this->remise_supplier_percent		= $obj->remise_supplier;
+				$this->remise_percent = $obj->remise_client;
+				$this->remise_supplier_percent = $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
+				$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->fk_account = $obj->fk_account;
 
 				$this->client      = $obj->client;
 				$this->fournisseur = $obj->fournisseur;
@@ -1401,7 +1401,7 @@ 
 
 				$this->outstanding_limit		= $obj->outstanding_limit;
 				$this->order_min_amount			= $obj->order_min_amount;
-				$this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
+				$this->supplier_order_min_amount = $obj->supplier_order_min_amount;
 
 				// multiprix
 				$this->price_level = $obj->price_level;
@@ -1431,12 +1431,12 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level = 1;
 
 		return $result;
 	}
@@ -1449,15 +1449,15 @@ 
 	 *    @param    int		$call_trigger   0=No, 1=yes
 	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
 	 */
-	function delete($id, User $fuser=null, $call_trigger=1)
+	function delete($id, User $fuser = null, $call_trigger = 1)
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) $fuser = $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$entity=isset($this->entity)?$this->entity:$conf->entity;
+		$entity = isset($this->entity) ? $this->entity : $conf->entity;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$error = 0;
@@ -1469,15 +1469,15 @@ 
 			$this->db->begin();
 
 			// User is mandatory for trigger call
-			if (! $error && $call_trigger)
+			if (!$error && $call_trigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
+				$result = $this->call_trigger('COMPANY_DELETE', $fuser);
 				if ($result < 0) $error++;
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				$static_cat = new Categorie($this->db);
@@ -1486,11 +1486,11 @@ 
 				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
 				if ($this->client || $this->prospect)
 				{
-					$toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+					$toute_categs['customer'] = $static_cat->containing($this->id, Categorie::TYPE_CUSTOMER);
 				}
 				if ($this->fournisseur)
 				{
-					$toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+					$toute_categs['supplier'] = $static_cat->containing($this->id, Categorie::TYPE_SUPPLIER);
 				}
 
 				// Remove each "Categorie"
@@ -1505,11 +1505,11 @@ 
 
 			foreach ($this->childtablesoncascade as $tabletodelete)
 			{
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
+					$sql .= " WHERE fk_soc = ".$id;
+					if (!$this->db->query($sql))
 					{
 						$error++;
 						$this->errors[] = $this->db->lasterror();
@@ -1518,9 +1518,9 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
 			{
-				$result=$this->deleteExtraFields();
+				$result = $this->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
@@ -1529,12 +1529,12 @@ 
 			}
 
 			// Remove links to subsidiaries companies
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-				$sql.= " SET parent = NULL";
-				$sql.= " WHERE parent = " . $id;
-				if (! $this->db->query($sql))
+				$sql .= " SET parent = NULL";
+				$sql .= " WHERE parent = ".$id;
+				if (!$this->db->query($sql))
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
@@ -1542,25 +1542,25 @@ 
 			}
 
 			// Remove third party
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-				$sql.= " WHERE rowid = " . $id;
-				if (! $this->db->query($sql))
+				$sql .= " WHERE rowid = ".$id;
+				if (!$this->db->query($sql))
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 
 				// Delete directory
-				if (! empty($conf->societe->multidir_output[$entity]))
+				if (!empty($conf->societe->multidir_output[$entity]))
 				{
-					$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+					$docdir = $conf->societe->multidir_output[$entity]."/".$id;
 					if (dol_is_dir($docdir))
 					{
 						dol_delete_dir_recursive($docdir);
@@ -1591,13 +1591,13 @@ 
         // phpcs:enable
 		if ($this->id)
 		{
-			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			$newclient = 1;
+			if ($this->client == 2 || $this->client == 3) $newclient = 3; //If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET client = ".$newclient;
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET client = ".$newclient;
+			$sql .= " WHERE rowid = ".$this->id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->client = $newclient;
@@ -1623,10 +1623,10 @@ 
 		global $conf, $langs;
 
 		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
+		$note = trim($note);
+		if (!$note)
 		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
 			return -2;
 		}
 
@@ -1636,33 +1636,33 @@ 
 		{
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " SET remise_client = '".$this->db->escape($remise)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 
 			// Ecrit trace dans historique des remises
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-			$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " '".$this->db->escape($note)."',";
+			$sql .= " ".$user->id;
+			$sql .= ")";
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 
@@ -1686,10 +1686,10 @@ 
 		global $conf, $langs;
 
 		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
+		$note = trim($note);
+		if (!$note)
 		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
 			return -2;
 		}
 
@@ -1699,33 +1699,33 @@ 
 		{
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 
 			// Ecrit trace dans historique des remises
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
-			$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " '".$this->db->escape($note)."',";
+			$sql .= " ".$user->id;
+			$sql .= ")";
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 
@@ -1745,7 +1745,7 @@ 
 	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *		@return	int					<0 if KO, id of discount record if OK
 	 */
-	function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
+	function set_remise_except($remise, User $user, $desc, $tva_tx = 0, $discount_type = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -1755,14 +1755,14 @@ 
 		$desc = trim($desc);
 
 		// Check parameters
-		if (! $remise > 0)
+		if (!$remise > 0)
 		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
+			$this->error = $langs->trans("ErrorWrongValueForParameter", "1");
 			return -1;
 		}
-		if (! $desc)
+		if (!$desc)
 		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","3");
+			$this->error = $langs->trans("ErrorWrongValueForParameter", "3");
 			return -2;
 		}
 
@@ -1771,25 +1771,25 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 			$discount = new DiscountAbsolute($this->db);
-			$discount->fk_soc=$this->id;
+			$discount->fk_soc = $this->id;
 
-			$discount->discount_type=$discount_type;
+			$discount->discount_type = $discount_type;
 
-			$discount->amount_ht=$discount->multicurrency_amount_ht=price2num($remise,'MT');
-			$discount->amount_tva=$discount->multicurrency_amount_tva=price2num($remise*$tva_tx/100,'MT');
-			$discount->amount_ttc=$discount->multicurrency_amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
+			$discount->amount_ht = $discount->multicurrency_amount_ht = price2num($remise, 'MT');
+			$discount->amount_tva = $discount->multicurrency_amount_tva = price2num($remise * $tva_tx / 100, 'MT');
+			$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
 
-			$discount->tva_tx=price2num($tva_tx,'MT');
-			$discount->description=$desc;
+			$discount->tva_tx = price2num($tva_tx, 'MT');
+			$discount->description = $desc;
 
-			$result=$discount->create($user);
+			$result = $discount->create($user);
 			if ($result > 0)
 			{
 				return $result;
 			}
 			else
 			{
-				$this->error=$discount->error;
+				$this->error = $discount->error;
 				return -3;
 			}
 		}
@@ -1805,19 +1805,19 @@ 
 	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
+	function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue, $discount_type);
 		if ($result >= 0)
 		{
 			return $result;
 		}
 		else
 		{
-			$this->error=$discountstatic->error;
+			$this->error = $discountstatic->error;
 			return -1;
 		}
 	}
@@ -1829,49 +1829,49 @@ 
 	 *  @param	int		$mode		0=Array with properties, 1=Array of id.
 	 *  @return array       		Array of sales representatives of third party
 	 */
-	function getSalesRepresentatives(User $user, $mode=0)
+	function getSalesRepresentatives(User $user, $mode = 0)
 	{
 		global $conf;
 
-		$reparray=array();
+		$reparray = array();
 
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 		{
-			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-			$sql.= " AND ug.entity = ".$conf->entity.")";
-			$sql.= " OR u.admin = 1)";
+			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
+			$sql .= " AND ug.entity = ".$conf->entity.")";
+			$sql .= " OR u.admin = 1)";
 		}
 		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
+			$sql .= " WHERE entity in (0, ".$conf->entity.")";
 
-		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
 		$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);
 
 				if (empty($mode))
 				{
-					$reparray[$i]['id']=$obj->rowid;
-					$reparray[$i]['lastname']=$obj->lastname;
-					$reparray[$i]['firstname']=$obj->firstname;
-					$reparray[$i]['email']=$obj->email;
-					$reparray[$i]['statut']=$obj->statut;
-					$reparray[$i]['entity']=$obj->entity;
-					$reparray[$i]['login']=$obj->login;
-					$reparray[$i]['photo']=$obj->photo;
+					$reparray[$i]['id'] = $obj->rowid;
+					$reparray[$i]['lastname'] = $obj->lastname;
+					$reparray[$i]['firstname'] = $obj->firstname;
+					$reparray[$i]['email'] = $obj->email;
+					$reparray[$i]['statut'] = $obj->statut;
+					$reparray[$i]['entity'] = $obj->entity;
+					$reparray[$i]['login'] = $obj->login;
+					$reparray[$i]['photo'] = $obj->photo;
 				}
 				else
 				{
-					$reparray[]=$obj->rowid;
+					$reparray[] = $obj->rowid;
 				}
 				$i++;
 			}
@@ -1896,13 +1896,13 @@ 
         // phpcs:enable
 		if ($this->id)
 		{
-			$now=dol_now();
+			$now = dol_now();
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-			$sql .= " WHERE rowid = " . $this->id;
+			$sql .= " WHERE rowid = ".$this->id;
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -1912,7 +1912,7 @@ 
 			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -1933,28 +1933,28 @@ 
 	function add_commercial(User $user, $commid)
 	{
         // phpcs:enable
-		$error=0;
+		$error = 0;
 
 
 		if ($this->id > 0 && $commid > 0)
 		{
 			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 			$this->db->query($sql);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " ( fk_soc, fk_user )";
-			$sql.= " VALUES (".$this->id.",".$commid.")";
+			$sql .= " ( fk_soc, fk_user )";
+			$sql .= " VALUES (".$this->id.",".$commid.")";
 
-			if (! $this->db->query($sql) )
+			if (!$this->db->query($sql))
 			{
 				dol_syslog(get_class($this)."::add_commercial Erreur");
 			}
 			else {
-				$this->context=array('commercial_modified'=>$commid);
+				$this->context = array('commercial_modified'=>$commid);
 
-				$result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
+				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
                 if ($result < 0) $error++;
 			}
 		}
@@ -1971,10 +1971,10 @@ 
 	function del_commercial(User $user, $commid)
 	{
         // phpcs:enable
-		$error=0;
-		$this->context=array('commercial_modified'=>$commid);
+		$error = 0;
+		$this->context = array('commercial_modified'=>$commid);
 
-		$result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
+		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
         if ($result < 0) $error++;
 
 		if ($this->id > 0 && $commid > 0)
@@ -1982,7 +1982,7 @@ 
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
 			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			if (! $this->db->query($sql) )
+			if (!$this->db->query($sql))
 			{
 				dol_syslog(get_class($this)."::del_commercial Erreur");
 			}
@@ -2000,162 +2000,162 @@ 
 	 *      @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='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-		$name=$this->name?$this->name:$this->nom;
+		$name = $this->name ? $this->name : $this->nom;
 
-		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
 
-             if(empty($option) && $this->client > 0) $option = 'customer';
-             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+             if (empty($option) && $this->client > 0) $option = 'customer';
+             if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
          }
 
 
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
 			$code = '';
-			if (($this->client) && (! empty ( $this->code_client ))
+			if (($this->client) && (!empty ($this->code_client))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
 				)
 			)
 			{
-				$code = $this->code_client . ' - ';
+				$code = $this->code_client.' - ';
 			}
 
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+			if (($this->fournisseur) && (!empty ($this->code_fournisseur))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
 				)
 			)
 			{
-				$code .= $this->code_fournisseur . ' - ';
+				$code .= $this->code_fournisseur.' - ';
 			}
 
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
-				$name =$code.' '.$name;
+				$name = $code.' '.$name;
 			}
 			else
 			{
-				$name =$code;
+				$name = $code;
 			}
 		}
 
 		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
-		$result=''; $label='';
-		$linkstart=''; $linkend='';
+		$result = ''; $label = '';
+		$linkstart = ''; $linkend = '';
 
-		if (! empty($this->logo) && class_exists('Form'))
+		if (!empty($this->logo) && class_exists('Form'))
 		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label.= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip">';
+			$label .= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+			$label .= '</div><div style="clear: both;"></div>';
 		}
 
-		$label.= '<div class="centpercent">';
+		$label .= '<div class="centpercent">';
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
 		{
-		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+		   $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		}
 		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowProspect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		}
 		elseif ($option == 'supplier')
 		{
-			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
 		}
 		elseif ($option == 'agenda')
 		{
-			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
 		}
 		elseif ($option == 'project')
 		{
-			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowProject").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
 		}
 		elseif ($option == 'margin')
 		{
-			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowMargin").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
 		}
 		elseif ($option == 'contact')
 		{
-			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowContacts").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
 		}
 		elseif ($option == 'ban')
 		{
-			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowBan").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
 		if (empty($linkstart))
 		{
-			$label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowCompany").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
 
-		if (! empty($this->name))
+		if (!empty($this->name))
 		{
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
-		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
+			if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+			$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
+		}
+		if (!empty($this->country_code))
+			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
+		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
+		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
 		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
-		}
-		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-
-		$label.= '</div>';
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
+		}
+		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3))
+			$label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
+		if (!empty($this->code_fournisseur) && $this->fournisseur)
+			$label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
+		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
+			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		if (!empty($conf->accounting->enabled) && $this->fournisseur)
+			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
+
+		$label .= '</div>';
 
 		// Add type of canvas
-		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+		$linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
 		// 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) $linkstart.='&save_lastsearch_values=1';
-		$linkstart.='"';
+		$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) $linkstart .= '&save_lastsearch_values=1';
+		$linkstart .= '"';
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowCompany");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowCompany");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip refurl"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip refurl"';
 
 		 	/*
 			$hookmanager->initHooks(array('thirdpartydao'));
@@ -2164,25 +2164,25 @@ 
 			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			*/
 		}
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		global $user;
-		if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+		if (!$user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
 		{
-			$linkstart='';
-			$linkend='';
+			$linkstart = '';
+			$linkend = '';
 		}
 
-		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
-		$result.=$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($name, $maxlen) : $name);
+		$result .= $linkend;
 
 		global $action;
 		$hookmanager->initHooks(array('thirdpartydao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $result = $hookmanager->resPrint;
 		else $result .= $hookmanager->resPrint;
 
@@ -2195,9 +2195,9 @@ 
 	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *    @return   string        		Libelle
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2208,7 +2208,7 @@ 
 	 *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string          		Libelle du statut
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -2216,38 +2216,38 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
+			if ($statut == 0) return $langs->trans("ActivityCeased");
+			elseif ($statut == 1) return $langs->trans("InActivity");
 		}
 		elseif ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
+			if ($statut == 0) return $langs->trans("ActivityCeased");
+			elseif ($statut == 1) return $langs->trans("InActivity");
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			elseif ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			elseif ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 		elseif ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 	}
 
@@ -2258,16 +2258,16 @@ 
 	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
 	 *    @return     array       					Array of contacts emails
 	 */
-	function thirdparty_and_contact_email_array($addthirdparty=0)
+	function thirdparty_and_contact_email_array($addthirdparty = 0)
 	{
         // phpcs:enable
 		global $langs;
 
-		$contact_emails = $this->contact_property_array('email',1);
+		$contact_emails = $this->contact_property_array('email', 1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
-			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
+			if (empty($this->name)) $this->name = $this->nom;
+			$contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
 		return $contact_emails;
@@ -2286,11 +2286,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (!empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) $this->name = $this->nom;
 			// TODO: Tester si tel non deja present dans tableau contact
-			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
+			$contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
 		}
 		return $contact_phone;
 	}
@@ -2303,7 +2303,7 @@ 
 	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
 	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
 	 */
-	function contact_property_array($mode='email', $hidedisabled=0)
+	function contact_property_array($mode = 'email', $hidedisabled = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -2312,45 +2312,45 @@ 
 
 
 		$sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE fk_soc = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql .= " WHERE fk_soc = ".$this->id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
 			if ($nump)
 			{
-				$sepa="("; $sepb=")";
+				$sepa = "("; $sepb = ")";
 				if ($mode == 'email')
 				{
 					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa="<"; $sepb=">";
+					$sepa = "<"; $sepb = ">";
 				}
 				$i = 0;
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') $property = $obj->email;
+					else if ($mode == 'mobile') $property = $obj->phone_mobile;
+					else $property = $obj->$mode;
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') $property = $langs->transnoentitiesnoconv("NoEMail");
+							else if ($mode == 'mobile') $property = $langs->transnoentitiesnoconv("NoMobilePhone");
 						}
 
 						if (!empty($obj->poste))
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 						else
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
 					$i++;
@@ -2377,7 +2377,7 @@ 
 		$contacts = array();
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2387,7 +2387,7 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
 					$i++;
 				}
 			}
@@ -2408,11 +2408,11 @@ 
 	function contact_array_objects()
 	{
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contacts = array();
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2444,18 +2444,18 @@ 
 	 *  @param  string	$mode       'email' or 'mobile'
 	 *  @return string  			Email of contact with format: "Full name <email>"
 	 */
-	function contact_get_property($rowid,$mode)
+	function contact_get_property($rowid, $mode)
 	{
         // phpcs:enable
-		$contact_property='';
+		$contact_property = '';
 
 		if (empty($rowid)) return '';
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE rowid = '".$rowid."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql .= " WHERE rowid = '".$rowid."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2483,13 +2483,13 @@ 
 	 *	@param	string	$mode	'label' or 'rum' or 'format'
 	 *  @return	string			Bank number
 	 */
-	function display_rib($mode='label')
+	function display_rib($mode = 'label')
 	{
         // phpcs:enable
-		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->id);
+		$bac->fetch(0, $this->id);
 
 		if ($mode == 'label')
 		{
@@ -2499,7 +2499,7 @@ 
 		{
 			if (empty($bac->rum))
 			{
-				require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 				$prelevement = new BonPrelevement($this->db);
 				$bac->fetch_thirdparty();
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
@@ -2523,7 +2523,7 @@ 
 	function get_all_rib()
 	{
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
 		$result = $this->db->query($sql);
 		if (!$result) {
@@ -2553,23 +2553,23 @@ 
 	 *	@param	int			$type		Should be 0 to say customer
 	 *  @return void
 	 */
-	function get_codeclient($objsoc=0,$type=0)
+	function get_codeclient($objsoc = 0, $type = 0)
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 			$mod = new $module();
 
-			$this->code_client = $mod->getNextValue($objsoc,$type);
+			$this->code_client = $mod->getNextValue($objsoc, $type);
 			$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
 
 			dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
@@ -2585,23 +2585,23 @@ 
 	 *	@param	int			$type		Should be 1 to say supplier
 	 *  @return void
 	 */
-	function get_codefournisseur($objsoc=0,$type=1)
+	function get_codefournisseur($objsoc = 0, $type = 1)
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 			$mod = new $module();
 
-			$this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+			$this->code_fournisseur = $mod->getNextValue($objsoc, $type);
 
 			dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 		}
@@ -2618,23 +2618,23 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+			if ($mod->code_modifiable_null && !$this->code_client) return 1;
 			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
 		else
@@ -2654,23 +2654,23 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+			if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
 			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
 		else
@@ -2694,14 +2694,14 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
@@ -2731,14 +2731,14 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
@@ -2768,13 +2768,13 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
 		{
-			$res=false;
-			$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			$res = false;
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
+				$res = dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
 				if ($res) break;
 			}
 
@@ -2819,10 +2819,10 @@ 
 		if ($this->id)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET parent = ".($id > 0 ? $id : "null");
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET parent = ".($id > 0 ? $id : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->parent = $id;
@@ -2848,28 +2848,28 @@ 
         // phpcs:enable
 		global $conf;
 
-	 	switch($idprof)
+	 	switch ($idprof)
 		{
 			case 1:
-				$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
 				break;
 			case 2:
-				$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
 				break;
 			case 3:
-				$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
 				break;
 			case 4:
-				$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
 				break;
 			case 5:
-				$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
 				break;
 			case 6:
-				$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
 				break;
 			default:
-				$ret=false;
+				$ret = false;
 		}
 
 		return $ret;
@@ -2884,40 +2884,40 @@ 
 	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
 	 *    @return   boolean				True if exists, False if not
 	 */
-	function id_prof_exists($idprof, $value, $socid=0)
+	function id_prof_exists($idprof, $value, $socid = 0)
 	{
         // phpcs:enable
 		$field = $idprof;
 
-	 	switch($idprof)	// For backward compatibility
+	 	switch ($idprof)	// For backward compatibility
 		{
 			case '1':
 			case 'idprof1':
-				$field="siren";
+				$field = "siren";
 				break;
 			case '2':
 			case 'idprof2':
-				$field="siret";
+				$field = "siret";
 				break;
 			case '3':
 			case 'idprof3':
-				$field="ape";
+				$field = "ape";
 				break;
 			case '4':
 			case 'idprof4':
-				$field="idprof4";
+				$field = "idprof4";
 				break;
 			case '5':
-				$field="idprof5";
+				$field = "idprof5";
 				break;
 			case '6':
-				$field="idprof6";
+				$field = "idprof6";
 				break;
 	 	}
 
 		 //Verify duplicate entries
-		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+		if ($socid) $sql .= " AND rowid <> ".$socid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2944,20 +2944,20 @@ 
 	 *  @return int             			<=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
-	function id_prof_check($idprof,$soc)
+	function id_prof_check($idprof, $soc)
 	{
         // phpcs:enable
 		global $conf;
 
-		$ok=1;
+		$ok = 1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
 		{
-			$chaine=trim($this->idprof1);
-			$chaine=preg_replace('/(\s)/','',$chaine);
+			$chaine = trim($this->idprof1);
+			$chaine = preg_replace('/(\s)/', '', $chaine);
 
 			if (!is_numeric($chaine)) return -1;
 			if (dol_strlen($chaine) != 9) return -1;
@@ -2967,7 +2967,7 @@ 
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 
-			for ($index = 0; $index < 9; $index ++)
+			for ($index = 0; $index < 9; $index++)
 			{
 				$number = (int) $siren[$index];
 				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
@@ -2981,8 +2981,8 @@ 
 		// Verifie SIRET si pays FR
 		if ($idprof == 2 && $soc->country_code == 'FR')
 		{
-			$chaine=trim($this->idprof2);
-			$chaine=preg_replace('/(\s)/','',$chaine);
+			$chaine = trim($this->idprof2);
+			$chaine = preg_replace('/(\s)/', '', $chaine);
 
 			if (!is_numeric($chaine)) return -1;
 			if (dol_strlen($chaine) != 14) return -1;
@@ -2992,7 +2992,7 @@ 
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 
-			for ($index = 0; $index < 14; $index ++)
+			for ($index = 0; $index < 14; $index++)
 			{
 				$number = (int) $chaine[$index];
 				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
@@ -3007,11 +3007,11 @@ 
 		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
 		if ($idprof == 1 && $soc->country_code == 'ES')
 		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
+			$string = trim($this->idprof1);
+			$string = preg_replace('/(\s)/', '', $string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
+			for ($i = 0; $i < 9; $i++)
 			$num[$i] = substr($string, $i, 1);
 
 			//Check format
@@ -3028,7 +3028,7 @@ 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
 			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+			$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
@@ -3054,7 +3054,7 @@ 
 
 			//Check NIE XYZ
 			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
 				return 3;
 				else
 				return -3;
@@ -3067,10 +3067,10 @@ 
 		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
 		if ($idprof == 1 && $soc->country_code == 'PT')
 		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
+			$string = trim($this->idprof1);
+			$string = preg_replace('/(\s)/', '', $string);
 
-			for ($i = 0; $i < 9; $i ++) {
+			for ($i = 0; $i < 9; $i++) {
 				$num[$i] = substr($string, $i, 1);
 			}
 
@@ -3095,38 +3095,38 @@ 
 	 *   @return	string          		Url or empty string if no URL known
 	 *   TODO better in a lib than into business class
 	 */
-	function id_prof_url($idprof,$thirdparty)
+	function id_prof_url($idprof, $thirdparty)
 	{
         // phpcs:enable
-		global $conf,$langs,$hookmanager;
+		global $conf, $langs, $hookmanager;
 
-		$url='';
+		$url = '';
 		$action = '';
 
 		$hookmanager->initHooks(array('idprofurl'));
-		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('idprof'=>$idprof, 'company'=>$thirdparty);
+		$reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook)) {
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
 				return '';
 			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
             $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
 			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
-				$url='http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
+				$url = 'http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
 			}
 			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
-				$url='https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
+				$url = 'https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
-				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
+				$url = 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
-				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+				$url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
-				$url='http://www.nif.pt/'.$strippedIdProf1;
+				$url = 'http://www.nif.pt/'.$strippedIdProf1;
 			}
 
 			if ($url) {
@@ -3149,7 +3149,7 @@ 
 	function has_projects()
 	{
         // phpcs:enable
-		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3175,11 +3175,11 @@ 
 	function info($id)
 	{
 		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-		$sql.= " fk_user_creat, fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.rowid = ".$id;
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.rowid = ".$id;
 
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -3191,7 +3191,7 @@ 
 				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_modif) {
@@ -3200,7 +3200,7 @@ 
 					$this->user_modification = $muser;
 				}
 
-				$this->ref			     = $obj->name;
+				$this->ref = $obj->name;
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 			}
@@ -3223,13 +3223,13 @@ 
 		global $conf;
 
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
+		if (!empty($this->tva_intra)) $isacompany = 1;
+		else if (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
-			else $isacompany=1;
+			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
+			else $isacompany = 1;
 		}
 
 		return $isacompany;
@@ -3257,13 +3257,13 @@ 
         // phpcs:enable
 		$this->SupplierCategories = array();
 		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
-		$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->SupplierCategories[$obj->rowid] = $obj->label;
 			}
@@ -3288,9 +3288,9 @@ 
 		if ($categorie_id > 0 && $this->id > 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
+			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
+			if ($resql = $this->db->query($sql)) return 0;
 		}
 		else
 		{
@@ -3310,48 +3310,48 @@ 
 	 *  @param	string		$customercode	Customer code
 	 *  @return int							<0 if KO, id of created account if OK
 	 */
-	function create_from_member(Adherent $member, $socname='', $socalias='', $customercode='')
+	function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
         // phpcs:enable
-		global $user,$langs;
+		global $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
-		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		$name = $socname ? $socname : $member->societe;
+		if (empty($name)) $name = $member->getFullName($langs);
 
-		$alias = $socalias?$socalias:'';
+		$alias = $socalias ? $socalias : '';
 
 		// Positionne parametres
-		$this->nom=$name;				// TODO deprecated
-		$this->name=$name;
-		$this->name_alias=$alias;
-		$this->address=$member->address;
-		$this->zip=$member->zip;
-		$this->town=$member->town;
-		$this->country_code=$member->country_code;
-		$this->country_id=$member->country_id;
-		$this->phone=$member->phone;       // Prof phone
-		$this->email=$member->email;
-		$this->skype=$member->skype;
-		$this->twitter=$member->twitter;
-		$this->facebook=$member->facebook;
-
-		$this->client = 1;				// A member is a customer by default
-		$this->code_client = ($customercode?$customercode:-1);
+		$this->nom = $name; // TODO deprecated
+		$this->name = $name;
+		$this->name_alias = $alias;
+		$this->address = $member->address;
+		$this->zip = $member->zip;
+		$this->town = $member->town;
+		$this->country_code = $member->country_code;
+		$this->country_id = $member->country_id;
+		$this->phone = $member->phone; // Prof phone
+		$this->email = $member->email;
+		$this->skype = $member->skype;
+		$this->twitter = $member->twitter;
+		$this->facebook = $member->facebook;
+
+		$this->client = 1; // A member is a customer by default
+		$this->code_client = ($customercode ? $customercode : -1);
 		$this->code_fournisseur = -1;
 
 		$this->db->begin();
 
 		// Cree et positionne $this->id
-		$result=$this->create($user);
+		$result = $this->create($user);
 		if ($result >= 0)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-			$sql.= " SET fk_soc=".$this->id;
-			$sql.= " WHERE rowid=".$member->id;
+			$sql .= " SET fk_soc=".$this->id;
+			$sql .= " WHERE rowid=".$member->id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->db->commit();
@@ -3359,7 +3359,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
@@ -3368,7 +3368,7 @@ 
 		else
 		{
 			// $this->error deja positionne
-			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
 			$this->db->rollback();
 			return $result;
@@ -3385,68 +3385,68 @@ 
 	{
 		global $langs;
 
-		$this->id=0;
-		$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
-		$this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
-		$this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
+		$this->id = 0;
+		$this->name = empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$this->address = empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+		$this->zip = empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP;
+		$this->town = empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN;
+		$this->state_id = empty($conf->global->MAIN_INFO_SOCIETE_STATE) ? '' : $conf->global->MAIN_INFO_SOCIETE_STATE;
+		$this->region_code = empty($conf->global->MAIN_INFO_SOCIETE_REGION) ? '' : $conf->global->MAIN_INFO_SOCIETE_REGION;
+		$this->object = empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? '' : $conf->global->MAIN_INFO_SOCIETE_OBJECT;
 
-		$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+		$this->note_private = empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOTE;
 
-		$this->nom=$this->name; 									// deprecated
+		$this->nom = $this->name; // deprecated
 
 		// We define country_id, country_code and country
-		$country_id=$country_code=$country_label='';
-		if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+		$country_id = $country_code = $country_label = '';
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		{
-			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+			$country_id = $tmp[0];
+			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
-				$country_code=$tmp[1];
-				$country_label=$tmp[2];
+				$country_code = $tmp[1];
+				$country_label = $tmp[2];
 			}
 			else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-				$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-				$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_code = getCountry($country_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_label = getCountry($country_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
 			}
 		}
-		$this->country_id=$country_id;
-		$this->country_code=$country_code;
-		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		$this->country_id = $country_id;
+		$this->country_code = $country_code;
+		$this->country = $country_label;
+		if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
 
-		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+		$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
+		$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
+		$this->url = empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? '' : $conf->global->MAIN_INFO_SOCIETE_WEB;
 		// Id prof generiques
-		$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-		$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-		$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-		$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-		$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-		$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-		$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-		$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-		$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-		$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-		$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
+		$this->idprof2 = empty($conf->global->MAIN_INFO_SIRET) ? '' : $conf->global->MAIN_INFO_SIRET;
+		$this->idprof3 = empty($conf->global->MAIN_INFO_APE) ? '' : $conf->global->MAIN_INFO_APE;
+		$this->idprof4 = empty($conf->global->MAIN_INFO_RCS) ? '' : $conf->global->MAIN_INFO_RCS;
+		$this->idprof5 = empty($conf->global->MAIN_INFO_PROFID5) ? '' : $conf->global->MAIN_INFO_PROFID5;
+		$this->idprof6 = empty($conf->global->MAIN_INFO_PROFID6) ? '' : $conf->global->MAIN_INFO_PROFID6;
+		$this->tva_intra = empty($conf->global->MAIN_INFO_TVAINTRA) ? '' : $conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA.
+		$this->managers = empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? '' : $conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+		$this->capital = empty($conf->global->MAIN_INFO_CAPITAL) ? '' : $conf->global->MAIN_INFO_CAPITAL;
+		$this->forme_juridique_code = empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) ? '' : $conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+		$this->email = empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? '' : $conf->global->MAIN_INFO_SOCIETE_MAIL;
+		$this->logo = empty($conf->global->MAIN_INFO_SOCIETE_LOGO) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO;
+		$this->logo_small = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+		$this->logo_mini = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 
 		// Define if company use vat or not
-		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+		$this->tva_assuj = $conf->global->FACTURE_TVAOPTION;
 
 		// Define if company use local taxes
-		$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-		$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+		$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on')) ? 1 : 0);
+		$this->localtax2_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on')) ? 1 : 0);
 	}
 
 	/**
@@ -3458,48 +3458,48 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$now=dol_now();
+		$now = dol_now();
 
 		// Initialize parameters
-		$this->id=0;
-		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-		$this->nom = $this->name;   // For backward compatibility
+		$this->id = 0;
+		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now, 'dayhourlog');
+		$this->nom = $this->name; // For backward compatibility
 		$this->ref_ext = 'Ref ext';
-		$this->specimen=1;
-		$this->address='21 jump street';
-		$this->zip='99999';
-		$this->town='MyTown';
-		$this->state_id=1;
-		$this->state_code='AA';
-		$this->state='MyState';
-		$this->country_id=1;
-		$this->country_code='FR';
-		$this->email='specimen@specimen.com';
-		$this->skype='tom.hanson';
-		$this->twitter='tomhanson';
-		$this->facebook='tomhanson';
-		$this->url='http://www.specimen.com';
-
-		$this->phone='0909090901';
-		$this->fax='0909090909';
-
-		$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-		$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-		$this->capital=10000;
-		$this->client=1;
-		$this->prospect=1;
-		$this->fournisseur=1;
-		$this->tva_assuj=1;
-		$this->tva_intra='EU1234567';
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
-
-		$this->idprof1='idprof1';
-		$this->idprof2='idprof2';
-		$this->idprof3='idprof3';
-		$this->idprof4='idprof4';
-		$this->idprof5='idprof5';
-		$this->idprof6='idprof6';
+		$this->specimen = 1;
+		$this->address = '21 jump street';
+		$this->zip = '99999';
+		$this->town = 'MyTown';
+		$this->state_id = 1;
+		$this->state_code = 'AA';
+		$this->state = 'MyState';
+		$this->country_id = 1;
+		$this->country_code = 'FR';
+		$this->email = 'specimen@specimen.com';
+		$this->skype = 'tom.hanson';
+		$this->twitter = 'tomhanson';
+		$this->facebook = 'tomhanson';
+		$this->url = 'http://www.specimen.com';
+
+		$this->phone = '0909090901';
+		$this->fax = '0909090909';
+
+		$this->code_client = 'CC-'.dol_print_date($now, 'dayhourlog');
+		$this->code_fournisseur = 'SC-'.dol_print_date($now, 'dayhourlog');
+		$this->capital = 10000;
+		$this->client = 1;
+		$this->prospect = 1;
+		$this->fournisseur = 1;
+		$this->tva_assuj = 1;
+		$this->tva_intra = 'EU1234567';
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+
+		$this->idprof1 = 'idprof1';
+		$this->idprof2 = 'idprof2';
+		$this->idprof3 = 'idprof3';
+		$this->idprof4 = 'idprof4';
+		$this->idprof5 = 'idprof5';
+		$this->idprof6 = 'idprof6';
 	}
 
 	/**
@@ -3508,7 +3508,7 @@ 
 	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
 	 *  @return		boolean					true or false
 	 */
-	function useLocalTax($localTaxNum=0)
+	function useLocalTax($localTaxNum = 0)
 	{
 		$sql  = "SELECT t.localtax1, t.localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3519,7 +3519,7 @@ 
 		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
@@ -3540,7 +3540,7 @@ 
 		$sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
 		dol_syslog("useNPR", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
@@ -3561,15 +3561,15 @@ 
 		$sql .= " AND r.active = 1";
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-   			return (($obj->nb > 0)?true:false);
+			$obj = $this->db->fetch_object($resql);
+   			return (($obj->nb > 0) ?true:false);
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return false;
 		}
 	}
@@ -3596,11 +3596,11 @@ 
         // phpcs:enable
 		global $langs;
 
-		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
 		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
 		{
-			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
 	}
@@ -3627,7 +3627,7 @@ 
 	 *  @param	string	$label		Label to use for status for added status
 	 *  @return string        		Libelle
 	 */
-	function getLibProspCommStatut($mode=0, $label='')
+	function getLibProspCommStatut($mode = 0, $label = '')
 	{
 		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
 	}
@@ -3641,7 +3641,7 @@ 
 	 *  @param	string		$label			Label to use for status for added status
 	 *  @return string       	 			Libelle du statut
 	 */
-	function LibProspCommStatut($statut, $mode=0, $label='')
+	function LibProspCommStatut($statut, $mode = 0, $label = '')
 	{
         // phpcs:enable
 		global $langs;
@@ -3649,11 +3649,11 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3661,11 +3661,11 @@ 
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1);
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
@@ -3673,11 +3673,11 @@ 
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3707,13 +3707,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingProposals($mode='customer')
+	function getOutstandingProposals($mode = 'customer')
 	{
-		$table='propal';
+		$table = 'propal';
 		if ($mode == 'supplier') $table = 'supplier_proposal';
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
 		} else {
@@ -3721,21 +3721,21 @@ 
 		}
 
 		dol_syslog("getOutstandingProposals", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 			return array();
@@ -3747,13 +3747,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingOrders($mode='customer')
+	function getOutstandingOrders($mode = 'customer')
 	{
-		$table='commande';
+		$table = 'commande';
 		if ($mode == 'supplier') $table = 'commande_fournisseur';
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_order').")";
 		} else {
@@ -3761,21 +3761,21 @@ 
 		}
 
 		dol_syslog("getOutstandingOrders", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 			return array();
@@ -3787,9 +3787,9 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingBills($mode='customer')
+	function getOutstandingBills($mode = 'customer')
 	{
-		$table='facture';
+		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
@@ -3799,9 +3799,9 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
 		} else {
@@ -3809,7 +3809,7 @@ 
 		}
 
 		dol_syslog("getOutstandingBills", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
@@ -3818,21 +3818,21 @@ 
 			if ($mode == 'supplier')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-				$tmpobject=new FactureFournisseur($this->db);
+				$tmpobject = new FactureFournisseur($this->db);
 			}
 			else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$tmpobject=new Facture($this->db);
+				$tmpobject = new Facture($this->db);
 			}
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+					&& !($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
-					$outstandingTotal+= $obj->total_ht;
-					$outstandingTotalIncTax+= $obj->total_ttc;
+					$outstandingTotal += $obj->total_ht;
+					$outstandingTotalIncTax += $obj->total_ttc;
 				}
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
@@ -3843,10 +3843,10 @@ 
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
-					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+					$outstandingOpened += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 		{
@@ -3873,26 +3873,26 @@ 
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
 		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
+		$sql .= " AND fk_statut <> 0"; // Not a draft
 		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
+		$sql .= " AND fk_statut <> 3"; // Not abandonned
+		$sql .= " AND fk_statut <> 2"; // Not clasified as paid
 
 		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingAmount = 0;
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$tmpobject=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			$tmpobject = new Facture($this->db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				$paiement = $tmpobject->getSommePaiement();
 				$creditnotes = $tmpobject->getSumCreditNotesUsed();
 				$deposits = $tmpobject->getSumDepositsUsed();
-				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+				$outstandingAmount += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
 		}
@@ -3923,10 +3923,10 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut == 0) return $langs->trans("NorProspectNorCustomer");
+		if ($statut == 1) return $langs->trans("Customer");
+		if ($statut == 2) return $langs->trans("Prospect");
+		if ($statut == 3) return $langs->trans("ProspectCustomer");
 	}
 
 
@@ -3941,26 +3941,26 @@ 
 	 *  @param  null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
+		if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
 		{
 			$modelpath = "core/modules/bank/doc/";
 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
-			if (! dol_strlen($modele))
+			if (!dol_strlen($modele))
 			{
-				if (! empty($conf->global->COMPANY_ADDON_PDF))
+				if (!empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
 				}
@@ -3973,7 +3973,7 @@ 
 
 			$modelpath = "core/modules/societe/doc/";
 
-			$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
 		return $result;
@@ -3993,7 +3993,7 @@ 
 	 */
 	public function setCategories($categories, $type)
 	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 		// Decode type
 		if ($type == 'customer') {
@@ -4003,7 +4003,7 @@ 
 			$type_id = Categorie::TYPE_SUPPLIER;
 			$type_text = 'supplier';
 		} else {
-			dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
+			dol_syslog(__METHOD__.': Type '.$type.'is an unknown company category type. Done nothing.', LOG_ERR);
 			return -1;
 		}
 

Braces +588 added lines, -352 removed lines

@@ -509,15 +509,25 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
+		if (empty($this->status)) {
+		    $this->status=0;
+		}
 		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+		    $this->name=ucwords($this->name);
+		}
 		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->client)) {
+		    $this->client=0;
+		}
+		if (empty($this->fournisseur)) {
+		    $this->fournisseur=0;
+		}
 		$this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+		    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -531,8 +541,12 @@ 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+		    $this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+		    $this->get_codefournisseur($this,1);
+		}
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -579,32 +593,32 @@ 
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_CREATE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+					    $error++;
+					}
 					// End call triggers
+				} else {
+				    $error++;
 				}
-				else $error++;
 
 				if (! $error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
 					$result=-1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$result=-2;
@@ -612,8 +626,7 @@ 
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -691,16 +704,13 @@ 
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
+				} elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -716,16 +726,13 @@ 
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
+				} elseif ($rescode == -5)
 				{
 					$this->errors[] = 'ErrorprefixRequired';
 				}
@@ -767,8 +774,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
@@ -795,7 +801,9 @@ 
 			}
 		}
 
-		if ($error) $result = -4;
+		if ($error) {
+		    $result = -4;
+		}
 
 		return $result;
 	}
@@ -818,7 +826,9 @@ 
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+		    $id = $this->id;
+		}
 
 		$error=0;
 
@@ -864,9 +874,13 @@ 
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+		    $this->status = 0;
+		}
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+		    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -880,8 +894,13 @@ 
 		$this->localtax1_value=trim($this->localtax1_value);
 		$this->localtax2_value=trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') {
+		    $this->capital=price2num(trim($this->capital));
+		}
+		if (! is_numeric($this->capital)) {
+		    $this->capital = '';
+		}
+		// '' = undef
 
 		$this->effectif_id=trim($this->effectif_id);
 		$this->forme_juridique_code=trim($this->forme_juridique_code);
@@ -890,8 +909,12 @@ 
 		$this->barcode=trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+		    $this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+		    $this->get_codefournisseur($this,1);
+		}
 
 		$this->code_compta=trim($this->code_compta);
 		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
@@ -911,7 +934,9 @@ 
 			if (empty($this->code_compta))
 			{
 				$ret=$this->get_codecompta('customer');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+				    return -1;
+				}
 			}
 
 			$customer=true;
@@ -924,7 +949,9 @@ 
 			if (empty($this->code_compta_fournisseur))
 			{
 				$ret=$this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+				    return -1;
+				}
 			}
 
 			$supplier=true;
@@ -955,16 +982,24 @@ 
 			{
 				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
 				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) {
+					    unset($this->errors[$key]);
+					}
+					// Remove error message
 				}
 				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
 				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) {
+					    unset($this->errors[$key]);
+					}
+					// Remove error message
 				}
-				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
+				if (empty($this->errors)) {
+				    // If there is no more error, we can make like if there is no error at all
 				{
 					$result = 0;
 				}
+				}
 			}
 		}
 
@@ -1017,20 +1052,24 @@ 
 				if($this->localtax1_value!='')
 				{
 					$sql .=",localtax1_value =".$this->localtax1_value;
+				} else {
+				    $sql .=",localtax1_value =0.000";
 				}
-				else $sql .=",localtax1_value =0.000";
+			} else {
+			    $sql .=",localtax1_value =0.000";
 			}
-			else $sql .=",localtax1_value =0.000";
 
 			if($this->localtax2_assuj==1)
 			{
 				if($this->localtax2_value!='')
 				{
 					$sql .=",localtax2_value =".$this->localtax2_value;
+				} else {
+				    $sql .=",localtax2_value =0.000";
 				}
-				else $sql .=",localtax2_value =0.000";
+			} else {
+			    $sql .=",localtax2_value =0.000";
 			}
-			else $sql .=",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1087,11 +1126,13 @@ 
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
-				if (is_object($this->oldcopy))	// If we have information on old values
+				if (is_object($this->oldcopy)) {
+				    // If we have information on old values
 				{
 					if ($this->oldcopy->country_id != $this->country_id)
 					{
 						unset($this->country_code);
+				}
 						unset($this->country);
 					}
 					if ($this->oldcopy->state_id != $this->state_id)
@@ -1099,8 +1140,7 @@ 
 						unset($this->state_code);
 						unset($this->state);
 					}
-				}
-				else
+				} else
 				{
 					unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
@@ -1141,8 +1181,7 @@ 
 								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 								$error++;
 							}
-						}
-						elseif ($result < 0)
+						} elseif ($result < 0)
 						{
 							$this->error=$lmember->error;
 							$error++;
@@ -1153,9 +1192,11 @@ 
 				$action='update';
 
 				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				    // For avoid conflicts if trigger used
 				{
 					$result=$this->insertExtraFields();
+				}
 					if ($result < 0)
 					{
 						$error++;
@@ -1166,7 +1207,9 @@ 
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+					    $error++;
+					}
 					// End call triggers
 				}
 
@@ -1175,22 +1218,19 @@ 
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else
+				} else
 				{
 					$this->error = $this->db->lasterror();
 					$result = -2;
@@ -1198,8 +1238,7 @@ 
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 	   {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -1229,7 +1268,9 @@ 
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+		    return -1;
+		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
@@ -1266,18 +1307,42 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		if ($rowid) {
+		    $sql .= ' AND s.rowid = '.$rowid;
+		}
+		if ($ref) {
+		    $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		}
+		if ($ref_alias) {
+		    $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
+		}
+		if ($ref_ext) {
+		    $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
+		if ($ref_int) {
+		    $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+		}
+		if ($idprof1) {
+		    $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		}
+		if ($idprof2) {
+		    $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		}
+		if ($idprof3) {
+		    $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		}
+		if ($idprof4) {
+		    $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		}
+		if ($idprof5) {
+		    $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		}
+		if ($idprof6) {
+		    $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		}
+		if ($email) {
+		    $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -1288,10 +1353,11 @@ 
 				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num) {
+			    // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
+			}
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
@@ -1421,22 +1487,22 @@ 
 
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else
+			} else
 			{
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) {
+		    $this->price_level=1;
+		}
 
 		return $result;
 	}
@@ -1453,7 +1519,9 @@ 
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) {
+		    $fuser=$user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1473,7 +1541,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+				    $error++;
+				}
 				// End call triggers
 			}
 
@@ -1518,9 +1588,11 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+			    // For avoid conflicts if trigger used
 			{
 				$result=$this->deleteExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
@@ -1568,15 +1640,15 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
+		} else {
+		    dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1592,7 +1664,10 @@ 
 		if ($this->id)
 		{
 			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			if ($this->client == 2 || $this->client == 3) {
+			    $newclient=3;
+			}
+			//If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql.= " SET client = ".$newclient;
 			$sql.= " WHERE rowid = " . $this->id;
@@ -1602,8 +1677,9 @@ 
 			{
 				$this->client = $newclient;
 				return 1;
+			} else {
+			    return -1;
 			}
-			else return -1;
 		}
 		return 0;
 	}
@@ -1786,14 +1862,14 @@ 
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error=$discount->error;
 				return -3;
 			}
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -1814,8 +1890,7 @@ 
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$discountstatic->error;
 			return -1;
@@ -1843,9 +1918,9 @@ 
 			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql.= " AND ug.entity = ".$conf->entity.")";
 			$sql.= " OR u.admin = 1)";
+		} else {
+					$sql.= " WHERE entity in (0, ".$conf->entity.")";
 		}
-		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -1868,16 +1943,14 @@ 
 					$reparray[$i]['entity']=$obj->entity;
 					$reparray[$i]['login']=$obj->login;
 					$reparray[$i]['photo']=$obj->photo;
-				}
-				else
+				} else
 				{
 					$reparray[]=$obj->rowid;
 				}
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1950,12 +2023,13 @@ 
 			if (! $this->db->query($sql) )
 			{
 				dol_syslog(get_class($this)."::add_commercial Erreur");
-			}
-			else {
+			} else {
 				$this->context=array('commercial_modified'=>$commid);
 
 				$result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
 			}
 		}
 	}
@@ -1975,7 +2049,9 @@ 
 		$this->context=array('commercial_modified'=>$commid);
 
 		$result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+            $error++;
+        }
 
 		if ($this->id > 0 && $commid > 0)
 		{
@@ -2004,14 +2080,21 @@ 
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (! empty($conf->dol_no_mouse_hover)) {
+		    $notooltip=1;
+		}
+		// Force disable tooltips
 
 		$name=$this->name?$this->name:$this->nom;
 
 		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
 
-             if(empty($option) && $this->client > 0) $option = 'customer';
-             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+             if(empty($option) && $this->client > 0) {
+                 $option = 'customer';
+             }
+             if(empty($option) && $this->fournisseur > 0) {
+                 $option = 'supplier';
+             }
          }
 
 
@@ -2039,14 +2122,15 @@ 
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
 				$name =$code.' '.$name;
-			}
-			else
+			} else
 			{
 				$name =$code;
 			}
 		}
 
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (!empty($this->name_alias)) {
+		    $name .= ' ('.$this->name_alias.')';
+		}
 
 		$result=''; $label='';
 		$linkstart=''; $linkend='';
@@ -2064,38 +2148,31 @@ 
 		{
 		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
 			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier')
+		} elseif ($option == 'supplier')
 		{
 			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
+		} elseif ($option == 'agenda')
 		{
 			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
+		} elseif ($option == 'project')
 		{
 			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
+		} elseif ($option == 'margin')
 		{
 			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
+		} elseif ($option == 'contact')
 		{
 			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
+		} elseif ($option == 'ban')
 		{
 			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
@@ -2111,30 +2188,50 @@ 
 		if (! empty($this->name))
 		{
 			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+			if (! empty($this->name_alias)) {
+			    $label.=' ('.$this->name_alias.')';
+			}
 			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
 		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+		if (! empty($this->country_code)) {
+					$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+		}
+		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
+					$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+		}
 		if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
 		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
-		}
-		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
+			}
+		}
+		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3)) {
+					$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+		}
+		if (! empty($this->code_fournisseur) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+		}
+		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
+					$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		}
+		if (! empty($conf->accounting->enabled) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		}
 
 		$label.= '</div>';
 
@@ -2142,8 +2239,12 @@ 
 		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
 		// 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) $linkstart.='&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) {
+		    $linkstart.='&save_lastsearch_values=1';
+		}
 		$linkstart.='"';
 
 		$linkclose='';
@@ -2175,16 +2276,23 @@ 
 		}
 
 		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		}
 		$result.=$linkend;
 
 		global $action;
 		$hookmanager->initHooks(array('thirdpartydao'));
 		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+		    $result = $hookmanager->resPrint;
+		} else {
+		    $result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -2216,38 +2324,53 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 1)
+			if ($statut==0) {
+			    return $langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return $langs->trans("InActivity");
+			}
+		} elseif ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 2)
+			if ($statut==0) {
+			    return $langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return $langs->trans("InActivity");
+			}
+		} elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 3)
+			if ($statut==0) {
+			    return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
+		} elseif ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 4)
+			if ($statut==0) {
+			    return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 5)
+			if ($statut==0) {
+			    return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
+		} elseif ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 6)
+			if ($statut==0) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 	}
 
@@ -2266,7 +2389,9 @@ 
 		$contact_emails = $this->contact_property_array('email',1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) {
+			    $this->name=$this->nom;
+			}
 			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
@@ -2286,9 +2411,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (! empty($this->phone)) {
+		    // If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
 			if (empty($this->name)) $this->name=$this->nom;
+		}
 			// TODO: Tester si tel non deja present dans tableau contact
 			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
 		}
@@ -2331,24 +2458,30 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') {
+					    $property=$obj->email;
+					} else if ($mode == 'mobile') {
+					    $property=$obj->phone_mobile;
+					} else {
+					    $property=$obj->$mode;
+					}
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') {
+							    $property=$langs->transnoentitiesnoconv("NoEMail");
+							} else if ($mode == 'mobile') {
+							    $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							}
 						}
 
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
+						} else
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
@@ -2356,8 +2489,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2391,8 +2523,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2428,8 +2559,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2449,7 +2579,9 @@ 
         // phpcs:enable
 		$contact_property='';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+		    return '';
+		}
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
@@ -2464,12 +2596,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
-				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+				if ($mode == 'email') {
+				    $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+				} else if ($mode == 'mobile') {
+				    $contact_property = $obj->phone_mobile;
+				}
 			}
 			return $contact_property;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2494,8 +2628,7 @@ 
 		if ($mode == 'label')
 		{
 			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
+		} elseif ($mode == 'rum')
 		{
 			if (empty($bac->rum))
 			{
@@ -2505,8 +2638,7 @@ 
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 			}
 			return $bac->rum;
-		}
-		elseif ($mode == 'format')
+		} elseif ($mode == 'format')
 		{
 			return $bac->frstrecur;
 		}
@@ -2565,7 +2697,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 			$mod = new $module();
 
@@ -2597,7 +2731,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 			$mod = new $module();
 
@@ -2626,18 +2762,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_client) {
+			    return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+			    return 1;
+			}
+			if ($mod->code_modifiable) {
+			    return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2662,18 +2806,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_fournisseur) {
+			    return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+			    return 1;
+			}
+			if ($mod->code_modifiable) {
+			    return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2702,7 +2854,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
@@ -2710,8 +2864,7 @@ 
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2739,7 +2892,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
@@ -2747,8 +2902,7 @@ 
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2775,7 +2929,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			if ($res)
@@ -2786,21 +2942,25 @@ 
 				// Defini code compta dans $mod->code
 				$result = $mod->get_code($this->db, $this, $type);
 
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+				if ($type == 'customer') {
+				    $this->code_compta = $mod->code;
+				} else if ($type == 'supplier') {
+				    $this->code_compta_fournisseur = $mod->code;
+				}
 
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else
+		} else
 		{
-			if ($type == 'customer') $this->code_compta = '';
-			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+			if ($type == 'customer') {
+			    $this->code_compta = '';
+			} else if ($type == 'supplier') {
+			    $this->code_compta_fournisseur = '';
+			}
 
 			return 0;
 		}
@@ -2827,13 +2987,13 @@ 
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
+		} else {
+		    return -1;
 		}
-		else return -1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2917,22 +3077,26 @@ 
 
 		 //Verify duplicate entries
 		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		if($socid) {
+		    $sql .= " AND rowid <> ".$socid;
+		}
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
 		}
 		$this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+		    return true;
+		} else {
+		    return false;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2951,7 +3115,9 @@ 
 
 		$ok=1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+		    return 1;
+		}
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
@@ -2959,8 +3125,12 @@ 
 			$chaine=trim($this->idprof1);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 9) return -1;
+			if (!is_numeric($chaine)) {
+			    return -1;
+			}
+			if (dol_strlen($chaine) != 9) {
+			    return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
@@ -2970,12 +3140,17 @@ 
 			for ($index = 0; $index < 9; $index ++)
 			{
 				$number = (int) $siren[$index];
-				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) != 0) { if (($number *= 2) > 9) {
+				    $number -= 9;
+				}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+			    return -1;
+			}
 		}
 
 		// Verifie SIRET si pays FR
@@ -2984,8 +3159,12 @@ 
 			$chaine=trim($this->idprof2);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 14) return -1;
+			if (!is_numeric($chaine)) {
+			    return -1;
+			}
+			if (dol_strlen($chaine) != 14) {
+			    return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
@@ -2995,12 +3174,17 @@ 
 			for ($index = 0; $index < 14; $index ++)
 			{
 				$number = (int) $chaine[$index];
-				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) == 0) { if (($number *= 2) > 9) {
+				    $number -= 9;
+				}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+			    return -1;
+			}
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
@@ -3011,53 +3195,61 @@ 
 			$string=preg_replace('/(\s)/','',$string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
-			$num[$i] = substr($string, $i, 1);
+			for ($i = 0; $i < 9; $i ++) {
+						$num[$i] = substr($string, $i, 1);
+			}
 
 			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+						return 0;
+			}
 
 			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+							if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 				return 1;
-				else
-				return -1;
+			} else {
+								return -1;
+				}
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+			for ($i = 1; $i < 8; $i += 2) {
+						$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+			}
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			if (preg_match('/^[KLM]{1}/', $string)) {
+							if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 				return 1;
-				else
-				return -1;
+			} else {
+								return -1;
+				}
 
 			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+							if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 				return 2;
-				else
-				return -2;
+			} else {
+								return -2;
+				}
 
 			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			if (preg_match('/^[T]{1}/', $string)) {
+							if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 				return 3;
-				else
-				return -3;
+			} else {
+								return -3;
+				}
 
 			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+			if (preg_match('/^[XYZ]{1}/', $string)) {
+							if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
 				return 3;
-				else
-				return -3;
+			} else {
+								return -3;
+				}
 
 			//Can not be verified
 			return -4;
@@ -3077,8 +3269,7 @@ 
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
 		}
@@ -3132,8 +3323,7 @@ 
 			if ($url) {
 				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
 			}
-		}
-		else {
+		} else {
 			return $hookmanager->resPrint;
 		}
 
@@ -3155,8 +3345,7 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
@@ -3206,8 +3395,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -3224,12 +3412,16 @@ 
 
 		// Define if third party is treated as company (or not) when nature is unknown
 		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		if (! empty($this->tva_intra)) {
+		    $isacompany=1;
+		} else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
-			else $isacompany=1;
+			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+			    $isacompany=0;
+			} else {
+			    $isacompany=1;
+			}
 		}
 
 		return $isacompany;
@@ -3268,8 +3460,7 @@ 
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -3290,9 +3481,10 @@ 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
 			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
-		}
-		else
+			if ($resql=$this->db->query($sql)) {
+			    return 0;
+			}
+		} else
 		{
 			return 0;
 		}
@@ -3318,7 +3510,9 @@ 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
 		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		if (empty($name)) {
+		    $name=$member->getFullName($langs);
+		}
 
 		$alias = $socalias?$socalias:'';
 
@@ -3356,16 +3550,14 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
@@ -3404,12 +3596,13 @@ 
 		{
 			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			if (! empty($tmp[1])) {
+			    // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
 				$country_code=$tmp[1];
-				$country_label=$tmp[2];
 			}
-			else                    // For backward compatibility
+				$country_label=$tmp[2];
+			} else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3420,7 +3613,9 @@ 
 		$this->country_id=$country_id;
 		$this->country_code=$country_code;
 		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		if (is_object($langs)) {
+		    $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		}
 
 		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3514,17 +3709,22 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+		if (empty($localTaxNum)) {
+		    $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		} elseif ($localTaxNum == 1) {
+		    $sql .= " AND t.localtax1_type <> '0'";
+		} elseif ($localTaxNum == 2) {
+		    $sql .= " AND t.localtax2_type <> '0'";
+		}
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3544,8 +3744,9 @@ 
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3566,8 +3767,7 @@ 
 		{
 			$obj=$this->db->fetch_object($resql);
    			return (($obj->nb > 0)?true:false);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return false;
@@ -3649,36 +3849,51 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+			    return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+			    return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+			    return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+			    return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+			    return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+			    return img_action($langs->trans("StatusProspect-1"),-1);
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+			    return img_action($langs->trans("StatusProspect0"), 0);
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+			    return img_action($langs->trans("StatusProspect1"), 1);
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+			    return img_action($langs->trans("StatusProspect2"), 2);
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+			    return img_action($langs->trans("StatusProspect3"), 3);
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+			    return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+			    return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+			    return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+			    return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+			    return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
@@ -3710,7 +3925,9 @@ 
 	function getOutstandingProposals($mode='customer')
 	{
 		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+		    $table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3730,15 +3947,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+				    // Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3750,7 +3969,9 @@ 
 	function getOutstandingOrders($mode='customer')
 	{
 		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+		    $table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3770,15 +3991,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+				    // Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3790,7 +4013,9 @@ 
 	function getOutstandingBills($mode='customer')
 	{
 		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+		    $table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -3799,8 +4024,11 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+		    $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+		    $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ". $this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
@@ -3819,8 +4047,7 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
+			} else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject=new Facture($this->db);
@@ -3837,18 +4064,19 @@ 
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
 					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
+					&& $obj->fk_statut != 2) {
+				    // Not classified as paid
 				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 				{
 					$paiement = $tmpobject->getSommePaiement();
+				}
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3895,9 +4123,9 @@ 
 				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
+		} else {
+					return 0;
 		}
-		else
-			return 0;
 	}
 
 	/**
@@ -3923,10 +4151,18 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut==0) {
+		    return $langs->trans("NorProspectNorCustomer");
+		}
+		if ($statut==1) {
+		    return $langs->trans("Customer");
+		}
+		if ($statut==2) {
+		    return $langs->trans("Prospect");
+		}
+		if ($statut==3) {
+		    return $langs->trans("ProspectCustomer");
+		}
 	}
 
 
@@ -3952,10 +4188,11 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			if (! $result) {
+			    dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			}
 			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
+		} else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
 			if (! dol_strlen($modele))
@@ -3963,8 +4200,7 @@ 
 				if (! empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
+				} else
 				{
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;

dolibarr/htdocs/societe/societecontact.php

Spacing +57 added lines, -57 removed lines

@@ -34,18 +34,18 @@ 
 
 $langs->loadLangs(array("orders", "companies"));
 
-$id=GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', $id, '');
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contactthirdparty','globalcard'));
+$hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
 
 
 /*
@@ -58,7 +58,7 @@ 
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
@@ -86,7 +86,7 @@ 
 {
 	if ($object->fetch($id))
 	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
+	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 	else
 	{
@@ -122,15 +122,15 @@ 
  * View
  */
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $langs->trans("ThirdParty"), $help_url);
 
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -139,7 +139,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -154,7 +154,7 @@ 
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     	print '<div class="fichecenter">';
 
@@ -171,7 +171,7 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
 		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
@@ -201,31 +201,31 @@ 
 		print '<br>';
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir)
 		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 			if ($res) break;
 		}
 
 		// additionnal list with adherents of company
-		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-			$membertypestatic=new AdherentType($db);
-			$memberstatic=new Adherent($db);
+			$membertypestatic = new AdherentType($db);
+			$memberstatic = new Adherent($db);
 
 			$langs->load("members");
 			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-			$sql.= " d.datefin,";
-			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-			$sql.= " t.libelle as type, t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE d.fk_soc = ".$id;
-			$sql.= " AND d.fk_adherent_type = t.rowid";
+			$sql .= " d.datefin,";
+			$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+			$sql .= " t.libelle as type, t.subscription";
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+			$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql .= " WHERE d.fk_soc = ".$id;
+			$sql .= " AND d.fk_adherent_type = t.rowid";
 
 			dol_syslog("get list sql=".$sql);
 			$resql = $db->query($sql);
@@ -233,39 +233,39 @@ 
 			{
 				$num = $db->num_rows($resql);
 
-				if ($num  > 0 )
+				if ($num > 0)
 				{
-					$titre=$langs->trans("MembersListOfTiers");
+					$titre = $langs->trans("MembersListOfTiers");
 					print '<br>';
 
-					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+					print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
 					print "<table class=\"noborder\" width=\"100%\">";
 					print '<tr class="liste_titre">';
-					print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+					print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "t.libelle", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
 					print "</tr>\n";
 
-					$i=0;
+					$i = 0;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($resql);
 
-						$datefin=$db->jdate($objp->datefin);
-						$memberstatic->id=$objp->rowid;
-						$memberstatic->ref=$objp->rowid;
-						$memberstatic->lastname=$objp->lastname;
-						$memberstatic->firstname=$objp->firstname;
-						$memberstatic->statut=$objp->statut;
-						$memberstatic->datefin=$db->jdate($objp->datefin);
+						$datefin = $db->jdate($objp->datefin);
+						$memberstatic->id = $objp->rowid;
+						$memberstatic->ref = $objp->rowid;
+						$memberstatic->lastname = $objp->lastname;
+						$memberstatic->firstname = $objp->firstname;
+						$memberstatic->statut = $objp->statut;
+						$memberstatic->datefin = $db->jdate($objp->datefin);
 
-						$companyname=$objp->company;
+						$companyname = $objp->company;
 
 						print '<tr class="oddeven">';
 
@@ -276,37 +276,37 @@ 
 
 						// Lastname
 						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+						print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
 						print "</a></td>\n";
 
 						// Login
 						print "<td>".$objp->login."</td>\n";
 
 						// Type
-						$membertypestatic->id=$objp->type_id;
-						$membertypestatic->libelle=$objp->type;
+						$membertypestatic->id = $objp->type_id;
+						$membertypestatic->libelle = $objp->type;
 						print '<td class="nowrap">';
-						print $membertypestatic->getNomUrl(1,32);
+						print $membertypestatic->getNomUrl(1, 32);
 						print '</td>';
 
 						// Moral/Physique
 						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
 
 						// EMail
-						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+						print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
 						// Statut
 						print '<td class="nowrap">';
-						print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
+						print $memberstatic->LibStatut($objp->statut, $objp->subscription, $datefin, 2);
 						print "</td>";
 
 						// End of subscription date
 						if ($datefin)
 						{
 							print '<td align="center" class="nowrap">';
-							print dol_print_date($datefin,'day');
+							print dol_print_date($datefin, 'day');
 							if ($memberstatic->hasDelay()) {
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}

dolibarr/htdocs/societe/project.php

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
 $langs->loadLangs(array("companies", "projects"));
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -46,8 +46,8 @@ 
  *	Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
@@ -71,25 +71,25 @@ 
 	$object = new Societe($db);
 	$result = $object->fetch($socid);
 
-	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+	$title = $langs->trans("Projects");
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	llxHeader('', $title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -143,7 +143,7 @@ 
 
 
 	// Projects list
-	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
+	$result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
 // End of page

dolibarr/htdocs/societe/notify/card.php

Spacing +91 added lines, -91 removed lines

@@ -32,32 +32,32 @@ 
 
 $langs->loadLangs(array("companies", "mails", "admin", "other"));
 
-$socid = GETPOST("socid",'int');
-$action = GETPOST('action','aZ09');
-$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
-$actionid=GETPOST('actionid');
+$socid = GETPOST("socid", 'int');
+$action = GETPOST('action', 'aZ09');
+$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
+$actionid = GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield=GETPOST("sortfield",'alpha');
-$sortorder=GETPOST("sortorder",'alpha');
-$page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', '', '');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "n.daten";
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$now=dol_now();
+$now = dol_now();
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartynotification','globalcard'));
+$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
 
 
 
@@ -65,29 +65,29 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
-    $error=0;
+    $error = 0;
 
     // Add a notification
     if ($action == 'add')
     {
         if (empty($contactid))
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
             $error++;
         }
         if ($actionid <= 0)
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->begin();
 
@@ -98,7 +98,7 @@ 
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
                 $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (! $db->query($sql))
+                if (!$db->query($sql))
                 {
                     $error++;
                     dol_print_error($db);
@@ -109,7 +109,7 @@ 
                 dol_print_error($db);
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $db->commit();
             }
@@ -137,12 +137,12 @@ 
 $form = new Form($db);
 
 $object = new Societe($db);
-$result=$object->fetch($socid);
+$result = $object->fetch($socid);
 
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 
 if ($result > 0)
@@ -155,7 +155,7 @@ 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -163,7 +163,7 @@ 
     print '<table class="border centpercent">';
 
     // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -177,7 +177,7 @@ 
         print '</td></tr>';
     }
 
-    if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
@@ -218,37 +218,37 @@ 
 
 
     // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"),'','');
+    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
     print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
 
-    $param="&socid=".$socid;
+    $param = "&socid=".$socid;
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
     print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var=false;
-    $listofemails=$object->thirdparty_and_contact_email_array();
+    $var = false;
+    $listofemails = $object->thirdparty_and_contact_email_array();
     if (count($listofemails) > 0)
     {
-        $actions=array();
+        $actions = array();
 
         // Load array of available notifications
-        $notificationtrigger=new InterfaceNotification($db);
-        $listofmanagedeventfornotification=$notificationtrigger->getListOfManagedEvents();
+        $notificationtrigger = new InterfaceNotification($db);
+        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach($listofmanagedeventfornotification as $managedeventfornotification)
+        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
         {
- 			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']]=$label;
+ 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+            $actions[$managedeventfornotification['rowid']] = $label;
         }
         print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
         print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
@@ -257,8 +257,8 @@ 
         print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td>';
-        $type=array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid",$type);
+        $type = array('email'=>$langs->trans("EMail"));
+        print $form->selectarray("typeid", $type);
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
@@ -279,16 +279,16 @@ 
 
     // List of notifications enabled for contacts
     $sql = "SELECT n.rowid, n.type,";
-    $sql.= " a.code, a.label,";
-    $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
-
-    $resql=$db->query($sql);
+    $sql .= " a.code, a.label,";
+    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND c.rowid = n.fk_contact";
+    $sql .= " AND c.fk_soc = ".$object->id;
+
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -299,15 +299,15 @@ 
     }
 
     // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
+    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+    print_liste_field_titre('', '', '');
     print '</tr>';
 
 	$langs->load("errors");
@@ -317,15 +317,15 @@ 
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
 
-            $contactstatic->id=$obj->contactid;
-            $contactstatic->lastname=$obj->lastname;
-            $contactstatic->firstname=$obj->firstname;
+            $contactstatic->id = $obj->contactid;
+            $contactstatic->lastname = $obj->lastname;
+            $contactstatic->firstname = $obj->firstname;
             print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
             if ($obj->type == 'email')
             {
@@ -336,12 +336,12 @@ 
                 else
                 {
                     $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -414,14 +414,14 @@ 
 
     // List
     $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql.= " a.code, a.label";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND n.fk_soc = ".$object->id;
-    $sql.= $db->order($sortfield, $sortorder);
+    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+    $sql .= " a.code, a.label";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND n.fk_soc = ".$object->id;
+    $sql .= $db->order($sortfield, $sortorder);
 
     // Count total nb of records
     $nbtotalofrecords = '';
@@ -436,9 +436,9 @@ 
         }
     }
 
-    $sql.= $db->plimit($limit+1, $offset);
+    $sql .= $db->plimit($limit + 1, $offset);
 
-    $resql=$db->query($sql);
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -448,9 +448,9 @@ 
         dol_print_error($db);
     }
 
-    $param='&socid='.$object->id;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param = '&socid='.$object->id;
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -467,18 +467,18 @@ 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
     //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"n.daten",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, 'align="right"', $sortfield, $sortorder);
     print '</tr>';
 
     if ($num > 0)
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
@@ -487,11 +487,11 @@ 
             print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
-	            $contactstatic->id=$obj->id;
-	            $contactstatic->lastname=$obj->lastname;
-	            $contactstatic->firstname=$obj->firstname;
+	            $contactstatic->id = $obj->id;
+	            $contactstatic->lastname = $obj->lastname;
+	            $contactstatic->firstname = $obj->firstname;
 	            print $contactstatic->getNomUrl(1);
-	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
             }
             else
 			{
@@ -499,7 +499,7 @@ 
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -527,7 +527,7 @@ 
 
     print '</form>';
 }
-else dol_print_error('','RecordNotFound');
+else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();

dolibarr/htdocs/societe/notify/index.php

Spacing +21 added lines, -21 removed lines

@@ -34,16 +34,16 @@ 
 
 if ($sortorder == "")
 {
-  $sortorder="ASC";
+  $sortorder = "ASC";
 }
 if ($sortfield == "")
 {
-  $sortfield="s.nom";
+  $sortfield = "s.nom";
 }
 
-if ($page == -1 || $page == null) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0; }
 
-$offset = $conf->liste_limit * $page ;
+$offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -56,18 +56,18 @@ 
 llxHeader();
 
 $sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
-$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-$sql.= " WHERE n.fk_contact = c.rowid";
-$sql.= " AND a.rowid = n.fk_action";
-$sql.= " AND n.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
-
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit, $offset);
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+$sql .= " WHERE n.fk_contact = c.rowid";
+$sql .= " AND a.rowid = n.fk_action";
+$sql .= " AND n.fk_soc = s.rowid";
+$sql .= " AND s.entity IN (".getEntity('societe').")";
+if ($socid > 0)	$sql .= " AND s.rowid = ".$user->societe_id;
+
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($conf->liste_limit, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -75,14 +75,14 @@ 
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
+	$paramlist = '';
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield, $sortorder, '', $num);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Contact", $_SERVER["PHP_SELF"], "c.lastname", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "a.titre", "", "", 'valign="center"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	while ($i < $num)

dolibarr/htdocs/societe/card.php

Indentation +1029 added lines, -1029 removed lines

@@ -76,9 +76,9 @@ 
 
 if (! ($object->id > 0) && $action == 'view')
 {
-	$langs->load("errors");
-	print($langs->trans('ErrorRecordNotFound'));
-	exit;
+    $langs->load("errors");
+    print($langs->trans('ErrorRecordNotFound'));
+    exit;
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
@@ -116,191 +116,191 @@ 
         }
     }
 
-	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		$error = 0;
-		$soc_origin_id = GETPOST('soc_origin', 'int');
-		$soc_origin = new Societe($db);
-
-		if ($soc_origin_id <= 0)
-		{
-			$langs->load('errors');
-			$langs->load('companies');
-			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
-		}
-		else
-		{
-			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
-			{
-				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
-				$error++;
-			}
-
-			if (!$error)
-			{
-			    // TODO Move the merge function into class of object.
-
-				$db->begin();
-
-				// Recopy some data
-				$object->client = $object->client | $soc_origin->client;
-				$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-				$listofproperties=array(
-					'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'url', 'barcode',
-					'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
-					'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
-					'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
-					'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
-					'model_pdf', 'fk_projet'
-				);
-				foreach ($listofproperties as $property)
-				{
-					if (empty($object->$property)) $object->$property = $soc_origin->$property;
-				}
+    if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
+    {
+        $error = 0;
+        $soc_origin_id = GETPOST('soc_origin', 'int');
+        $soc_origin = new Societe($db);
 
-				// Concat some data
-				$listofproperties=array(
-				    'note_public', 'note_private'
-				);
-				foreach ($listofproperties as $property)
-				{
-				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
-				}
+        if ($soc_origin_id <= 0)
+        {
+            $langs->load('errors');
+            $langs->load('companies');
+            setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
+        }
+        else
+        {
+            if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
+            {
+                setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
+                $error++;
+            }
 
-				// Merge extrafields
-				if (is_array($soc_origin->array_options))
-				{
-					foreach ($soc_origin->array_options as $key => $val)
-					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
-					}
-				}
+            if (!$error)
+            {
+                // TODO Move the merge function into class of object.
 
-				// Merge categories
-				$static_cat = new Categorie($db);
-
-				$custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id');
-				$custcats = $static_cat->containing($object->id, 'customer', 'id');
-				$custcats = array_merge($custcats,$custcats_ori);
-				$object->setCategories($custcats, 'customer');
-
-				$suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id');
-				$suppcats = $static_cat->containing($object->id, 'supplier', 'id');
-				$suppcats = array_merge($suppcats,$suppcats_ori);
-				$object->setCategories($suppcats, 'supplier');
-
-				// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
-				if ($soc_origin->code_client == $object->code_client
-					|| $soc_origin->code_fournisseur == $object->code_fournisseur
-					|| $soc_origin->barcode == $object->barcode)
-				{
-					dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
-					$soc_origin->code_client = '';
-					$soc_origin->code_fournisseur = '';
-					$soc_origin->barcode = '';
-					$soc_origin->update($soc_origin->id, $user, 0, 1, 1, 'merge');
-				}
+                $db->begin();
 
-				// Update
-				$object->update($object->id, $user, 0, 1, 1, 'merge');
-				if ($result < 0)
-				{
-					$error++;
-				}
+                // Recopy some data
+                $object->client = $object->client | $soc_origin->client;
+                $object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
+                $listofproperties=array(
+                    'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'url', 'barcode',
+                    'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
+                    'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+                    'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
+                    'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
+                    'model_pdf', 'fk_projet'
+                );
+                foreach ($listofproperties as $property)
+                {
+                    if (empty($object->$property)) $object->$property = $soc_origin->$property;
+                }
 
-				// Move links
-				if (! $error)
-				{
-					$objects = array(
-						'Adherent' => '/adherents/class/adherent.class.php',
-						'Societe' => '/societe/class/societe.class.php',
-						//'Categorie' => '/categories/class/categorie.class.php',
-						'ActionComm' => '/comm/action/class/actioncomm.class.php',
-						'Propal' => '/comm/propal/class/propal.class.php',
-						'Commande' => '/commande/class/commande.class.php',
-						'Facture' => '/compta/facture/class/facture.class.php',
-						'FactureRec' => '/compta/facture/class/facture-rec.class.php',
-						'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
-						'Contact' => '/contact/class/contact.class.php',
-						'Contrat' => '/contrat/class/contrat.class.php',
-						'Expedition' => '/expedition/class/expedition.class.php',
-						'Fichinter' => '/fichinter/class/fichinter.class.php',
-						'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
-						'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
-						'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
-						'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-						'Livraison' => '/livraison/class/livraison.class.php',
-						'Product' => '/product/class/product.class.php',
-						'Project' => '/projet/class/project.class.php',
-						'User' => '/user/class/user.class.php',
-					);
-
-					//First, all core objects must update their tables
-					foreach ($objects as $object_name => $object_file)
-					{
-						require_once DOL_DOCUMENT_ROOT.$object_file;
+                // Concat some data
+                $listofproperties=array(
+                    'note_public', 'note_private'
+                );
+                foreach ($listofproperties as $property)
+                {
+                    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+                }
 
-						if (!$error && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
-						{
-							$error++;
-							setEventMessages($db->lasterror(), null, 'errors');
-						}
-					}
-				}
+                // Merge extrafields
+                if (is_array($soc_origin->array_options))
+                {
+                    foreach ($soc_origin->array_options as $key => $val)
+                    {
+                        if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+                    }
+                }
 
-				// External modules should update their ones too
-				if (! $error)
-				{
-					$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
-						'soc_origin' => $soc_origin->id,
-						'soc_dest' => $object->id
-					), $soc_dest, $action);
+                // Merge categories
+                $static_cat = new Categorie($db);
 
-					if ($reshook < 0)
-					{
-						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-						$error++;
-					}
-				}
+                $custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id');
+                $custcats = $static_cat->containing($object->id, 'customer', 'id');
+                $custcats = array_merge($custcats,$custcats_ori);
+                $object->setCategories($custcats, 'customer');
 
+                $suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id');
+                $suppcats = $static_cat->containing($object->id, 'supplier', 'id');
+                $suppcats = array_merge($suppcats,$suppcats_ori);
+                $object->setCategories($suppcats, 'supplier');
 
-				if (! $error)
-				{
-					$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+                // If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
+                if ($soc_origin->code_client == $object->code_client
+                    || $soc_origin->code_fournisseur == $object->code_fournisseur
+                    || $soc_origin->barcode == $object->barcode)
+                {
+                    dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
+                    $soc_origin->code_client = '';
+                    $soc_origin->code_fournisseur = '';
+                    $soc_origin->barcode = '';
+                    $soc_origin->update($soc_origin->id, $user, 0, 1, 1, 'merge');
+                }
 
-					// Call trigger
-					$result=$object->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0)
-					{
-						setEventMessages($object->error, $object->errors, 'errors');
-						$error++;
-					}
-					// End call triggers
-				}
+                // Update
+                $object->update($object->id, $user, 0, 1, 1, 'merge');
+                if ($result < 0)
+                {
+                    $error++;
+                }
 
-				if (!$error)
-				{
-					//We finally remove the old thirdparty
-					if ($soc_origin->delete($soc_origin->id, $user) < 1)
-					{
-						$error++;
-					}
-				}
+                // Move links
+                if (! $error)
+                {
+                    $objects = array(
+                        'Adherent' => '/adherents/class/adherent.class.php',
+                        'Societe' => '/societe/class/societe.class.php',
+                        //'Categorie' => '/categories/class/categorie.class.php',
+                        'ActionComm' => '/comm/action/class/actioncomm.class.php',
+                        'Propal' => '/comm/propal/class/propal.class.php',
+                        'Commande' => '/commande/class/commande.class.php',
+                        'Facture' => '/compta/facture/class/facture.class.php',
+                        'FactureRec' => '/compta/facture/class/facture-rec.class.php',
+                        'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+                        'Contact' => '/contact/class/contact.class.php',
+                        'Contrat' => '/contrat/class/contrat.class.php',
+                        'Expedition' => '/expedition/class/expedition.class.php',
+                        'Fichinter' => '/fichinter/class/fichinter.class.php',
+                        'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
+                        'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
+                        'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
+                        'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
+                        'Livraison' => '/livraison/class/livraison.class.php',
+                        'Product' => '/product/class/product.class.php',
+                        'Project' => '/projet/class/project.class.php',
+                        'User' => '/user/class/user.class.php',
+                    );
+
+                    //First, all core objects must update their tables
+                    foreach ($objects as $object_name => $object_file)
+                    {
+                        require_once DOL_DOCUMENT_ROOT.$object_file;
 
-				if (!$error)
-				{
-					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
-					$db->commit();
-				}
-				else
-				{
-				    $langs->load("errors");
-					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
-					$db->rollback();
-				}
-			}
-		}
-	}
+                        if (!$error && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
+                        {
+                            $error++;
+                            setEventMessages($db->lasterror(), null, 'errors');
+                        }
+                    }
+                }
+
+                // External modules should update their ones too
+                if (! $error)
+                {
+                    $reshook = $hookmanager->executeHooks('replaceThirdparty', array(
+                        'soc_origin' => $soc_origin->id,
+                        'soc_dest' => $object->id
+                    ), $soc_dest, $action);
+
+                    if ($reshook < 0)
+                    {
+                        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+                        $error++;
+                    }
+                }
+
+
+                if (! $error)
+                {
+                    $object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+
+                    // Call trigger
+                    $result=$object->call_trigger('COMPANY_MODIFY',$user);
+                    if ($result < 0)
+                    {
+                        setEventMessages($object->error, $object->errors, 'errors');
+                        $error++;
+                    }
+                    // End call triggers
+                }
+
+                if (!$error)
+                {
+                    //We finally remove the old thirdparty
+                    if ($soc_origin->delete($soc_origin->id, $user) < 1)
+                    {
+                        $error++;
+                    }
+                }
+
+                if (!$error)
+                {
+                    setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
+                    $db->commit();
+                }
+                else
+                {
+                    $langs->load("errors");
+                    setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
+                    $db->rollback();
+                }
+            }
+        }
+    }
 
     if (GETPOST('getcustomercode'))
     {
@@ -316,17 +316,17 @@ 
 
     if($action=='set_localtax1')
     {
-    	//obtidre selected del combobox
-    	$value=GETPOST('lt1');
-    	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+        //obtidre selected del combobox
+        $value=GETPOST('lt1');
+        $object->fetch($socid);
+        $res=$object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
     if($action=='set_localtax2')
     {
-    	//obtidre selected del combobox
-    	$value=GETPOST('lt2');
-    	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+        //obtidre selected del combobox
+        $value=GETPOST('lt2');
+        $object->fetch($socid);
+        $res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
 
     if ($action == 'update_extras') {
@@ -341,12 +341,12 @@ 
 
         if (! $error)
         {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
-        	if ($result < 0)
-        	{
-        		setEventMessages($object->error, $object->errors, 'errors');
-        		$error++;
-        	}
+            $result = $object->insertExtraFields('COMPANY_MODIFY');
+            if ($result < 0)
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
         }
 
         if ($error) $action = 'edit_extras';
@@ -376,145 +376,145 @@ 
 
         if (! $error)
         {
-        	if ($action == 'update')
-	        {
-	        	$ret=$object->fetch($socid);
-				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas=$canvas;
-
-	        if (GETPOST("private") == 1)	// Ask to create a contact
-	        {
-	            $object->particulier		= GETPOST("private");
-
-	            $object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
-	            $object->civility_id		= GETPOST('civility_id');	// Note: civility id is a code, not an int
-	            // Add non official properties
-	            $object->name_bis			= GETPOST('name','alpha');
-	            $object->firstname			= GETPOST('firstname','alpha');
-	        }
-	        else
-	        {
-	            $object->name				= GETPOST('name', 'alpha');
-	        }
-	        $object->entity					= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
-	        $object->name_alias				= GETPOST('name_alias');
-	        $object->address				= GETPOST('address');
-	        $object->zip					= GETPOST('zipcode', 'alpha');
-	        $object->town					= GETPOST('town', 'alpha');
-	        $object->country_id				= GETPOST('country_id', 'int');
-	        $object->state_id				= GETPOST('state_id', 'int');
-	        $object->skype					= GETPOST('skype', 'alpha');
-	        $object->twitter				= GETPOST('twitter', 'alpha');
-	        $object->facebook				= GETPOST('facebook', 'alpha');
-	        $object->phone					= GETPOST('phone', 'alpha');
-	        $object->fax					= GETPOST('fax','alpha');
-	        $object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-	        $object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
-	        $object->idprof1				= trim(GETPOST('idprof1', 'alpha'));
-	        $object->idprof2				= trim(GETPOST('idprof2', 'alpha'));
-	        $object->idprof3				= trim(GETPOST('idprof3', 'alpha'));
-	        $object->idprof4				= trim(GETPOST('idprof4', 'alpha'));
-	        $object->idprof5				= trim(GETPOST('idprof5', 'alpha'));
-	        $object->idprof6				= trim(GETPOST('idprof6', 'alpha'));
-	        $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
-	        $object->code_client			= GETPOSTISSET('customer_code')?GETPOST('customer_code', 'alpha'):GETPOST('code_client', 'alpha');
-	        $object->code_fournisseur		= GETPOSTISSET('supplier_code')?GETPOST('supplier_code', 'alpha'):GETPOST('code_fournisseur', 'alpha');
-	        $object->capital				= GETPOST('capital', 'alpha');
-	        $object->barcode				= GETPOST('barcode', 'alpha');
-
-	        $object->tva_intra				= GETPOST('tva_intra', 'alpha');
-	        $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-	        $object->status					= GETPOST('status', 'alpha');
-
-	        // Local Taxes
-	        $object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
-	        $object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
-
-	        $object->localtax1_value		= GETPOST('lt1', 'alpha');
-	        $object->localtax2_value		= GETPOST('lt2', 'alpha');
-
-	        $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
-	        $object->effectif_id			= GETPOST('effectif_id', 'int');
-	        $object->typent_id				= GETPOST('typent_id','int');
-
-	        $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
-
-	        $object->client					= GETPOST('client', 'int');
-	        $object->fournisseur			= GETPOST('fournisseur', 'int');
-
-	        $object->commercial_id			= GETPOST('commercial_id', 'int');
-	        $object->default_lang			= GETPOST('default_lang');
-
-	        // Webservices url/key
-	        $object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-	        $object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
-
-			// Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
-				$object->fk_incoterms		= GETPOST('incoterm_id', 'int');
-				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
-			}
-
-			// Multicurrency
-			if (!empty($conf->multicurrency->enabled))
-			{
-				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-			}
-
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-			if ($ret < 0)
-			{
-				 $error++;
-			}
-
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
-
-	        // Check parameters
-	        if (! GETPOST('cancel','alpha'))
-	        {
-	            if (! empty($object->email) && ! isValidEMail($object->email))
-	            {
-	                $langs->load("errors");
-	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
-	            }
-	            if (! empty($object->url) && ! isValidUrl($object->url))
-	            {
-	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
-	            }
-	            if (! empty($object->webservices_url)) {
-	                //Check if has transport, without any the soap client will give error
-	                if (strpos($object->webservices_url, "http") === false)
-	                {
-	                    $object->webservices_url = "http://".$object->webservices_url;
-	                }
-	                if (! isValidUrl($object->webservices_url)) {
-	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
-	                }
-	            }
-
-	            // We set country_id, country_code and country for the selected country
-	            $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
-	            if ($object->country_id)
-	            {
-	            	$tmparray=getCountry($object->country_id,'all');
-	            	$object->country_code=$tmparray['code'];
-	            	$object->country=$tmparray['label'];
-	            }
-	        }
+            if ($action == 'update')
+            {
+                $ret=$object->fetch($socid);
+                $object->oldcopy = clone $object;
+            }
+            else $object->canvas=$canvas;
+
+            if (GETPOST("private") == 1)	// Ask to create a contact
+            {
+                $object->particulier		= GETPOST("private");
+
+                $object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
+                $object->civility_id		= GETPOST('civility_id');	// Note: civility id is a code, not an int
+                // Add non official properties
+                $object->name_bis			= GETPOST('name','alpha');
+                $object->firstname			= GETPOST('firstname','alpha');
+            }
+            else
+            {
+                $object->name				= GETPOST('name', 'alpha');
+            }
+            $object->entity					= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
+            $object->name_alias				= GETPOST('name_alias');
+            $object->address				= GETPOST('address');
+            $object->zip					= GETPOST('zipcode', 'alpha');
+            $object->town					= GETPOST('town', 'alpha');
+            $object->country_id				= GETPOST('country_id', 'int');
+            $object->state_id				= GETPOST('state_id', 'int');
+            $object->skype					= GETPOST('skype', 'alpha');
+            $object->twitter				= GETPOST('twitter', 'alpha');
+            $object->facebook				= GETPOST('facebook', 'alpha');
+            $object->phone					= GETPOST('phone', 'alpha');
+            $object->fax					= GETPOST('fax','alpha');
+            $object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+            $object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
+            $object->idprof1				= trim(GETPOST('idprof1', 'alpha'));
+            $object->idprof2				= trim(GETPOST('idprof2', 'alpha'));
+            $object->idprof3				= trim(GETPOST('idprof3', 'alpha'));
+            $object->idprof4				= trim(GETPOST('idprof4', 'alpha'));
+            $object->idprof5				= trim(GETPOST('idprof5', 'alpha'));
+            $object->idprof6				= trim(GETPOST('idprof6', 'alpha'));
+            $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
+            $object->code_client			= GETPOSTISSET('customer_code')?GETPOST('customer_code', 'alpha'):GETPOST('code_client', 'alpha');
+            $object->code_fournisseur		= GETPOSTISSET('supplier_code')?GETPOST('supplier_code', 'alpha'):GETPOST('code_fournisseur', 'alpha');
+            $object->capital				= GETPOST('capital', 'alpha');
+            $object->barcode				= GETPOST('barcode', 'alpha');
+
+            $object->tva_intra				= GETPOST('tva_intra', 'alpha');
+            $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
+            $object->status					= GETPOST('status', 'alpha');
+
+            // Local Taxes
+            $object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
+            $object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
+
+            $object->localtax1_value		= GETPOST('lt1', 'alpha');
+            $object->localtax2_value		= GETPOST('lt2', 'alpha');
+
+            $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+            $object->effectif_id			= GETPOST('effectif_id', 'int');
+            $object->typent_id				= GETPOST('typent_id','int');
+
+            $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
+
+            $object->client					= GETPOST('client', 'int');
+            $object->fournisseur			= GETPOST('fournisseur', 'int');
+
+            $object->commercial_id			= GETPOST('commercial_id', 'int');
+            $object->default_lang			= GETPOST('default_lang');
+
+            // Webservices url/key
+            $object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+            $object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
+
+            // Incoterms
+            if (!empty($conf->incoterm->enabled))
+            {
+                $object->fk_incoterms		= GETPOST('incoterm_id', 'int');
+                $object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
+            }
+
+            // Multicurrency
+            if (!empty($conf->multicurrency->enabled))
+            {
+                $object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+            }
+
+            // Fill array 'array_options' with data from add form
+            $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+            if ($ret < 0)
+            {
+                    $error++;
+            }
+
+            if (GETPOST('deletephoto')) $object->logo = '';
+            else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+
+            // Check parameters
+            if (! GETPOST('cancel','alpha'))
+            {
+                if (! empty($object->email) && ! isValidEMail($object->email))
+                {
+                    $langs->load("errors");
+                    $error++;
+                    setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
+                }
+                if (! empty($object->url) && ! isValidUrl($object->url))
+                {
+                    $langs->load("errors");
+                    setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
+                }
+                if (! empty($object->webservices_url)) {
+                    //Check if has transport, without any the soap client will give error
+                    if (strpos($object->webservices_url, "http") === false)
+                    {
+                        $object->webservices_url = "http://".$object->webservices_url;
+                    }
+                    if (! isValidUrl($object->webservices_url)) {
+                        $langs->load("errors");
+                        $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
+                    }
+                }
+
+                // We set country_id, country_code and country for the selected country
+                $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
+                if ($object->country_id)
+                {
+                    $tmparray=getCountry($object->country_id,'all');
+                    $object->country_code=$tmparray['code'];
+                    $object->country=$tmparray['label'];
+                }
+            }
         }
 
         if (! $error)
         {
             if ($action == 'add')
             {
-            	$error = 0;
+                $error = 0;
 
                 $db->begin();
 
@@ -523,45 +523,45 @@ 
 
                 $result = $object->create($user);
 
-				if ($result >= 0)
-				{
-					if ($object->particulier)
-					{
-						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
-						$result=$object->create_individual($user);
-						if ($result < 0)
-						{
-							setEventMessages($object->error, $object->errors, 'errors');
-							$error++;
-						}
-					}
+                if ($result >= 0)
+                {
+                    if ($object->particulier)
+                    {
+                        dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
+                        $result=$object->create_individual($user);
+                        if ($result < 0)
+                        {
+                            setEventMessages($object->error, $object->errors, 'errors');
+                            $error++;
+                        }
+                    }
 
-					// Links with users
-					$salesreps = GETPOST('commercial', 'array');
-					$result = $object->setSalesRep($salesreps);
-					if ($result < 0)
-					{
-						$error++;
-						setEventMessages($object->error, $object->errors, 'errors');
-					}
+                    // Links with users
+                    $salesreps = GETPOST('commercial', 'array');
+                    $result = $object->setSalesRep($salesreps);
+                    if ($result < 0)
+                    {
+                        $error++;
+                        setEventMessages($object->error, $object->errors, 'errors');
+                    }
 
-					// Customer categories association
-					$custcats = GETPOST('custcats', 'array');
-					$result = $object->setCategories($custcats, 'customer');
-					if ($result < 0)
-					{
-						$error++;
-						setEventMessages($object->error, $object->errors, 'errors');
-					}
+                    // Customer categories association
+                    $custcats = GETPOST('custcats', 'array');
+                    $result = $object->setCategories($custcats, 'customer');
+                    if ($result < 0)
+                    {
+                        $error++;
+                        setEventMessages($object->error, $object->errors, 'errors');
+                    }
 
-					// Supplier categories association
-					$suppcats = GETPOST('suppcats', 'array');
-					$result = $object->setCategories($suppcats, 'supplier');
-					if ($result < 0)
-					{
-						$error++;
-						setEventMessages($object->error, $object->errors, 'errors');
-					}
+                    // Supplier categories association
+                    $suppcats = GETPOST('suppcats', 'array');
+                    $result = $object->setCategories($suppcats, 'supplier');
+                    if ($result < 0)
+                    {
+                        $error++;
+                        setEventMessages($object->error, $object->errors, 'errors');
+                    }
 
                     // Logo/Photo save
                     $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
@@ -590,52 +590,52 @@ 
                         }
                     }
                     else
-					{
-						switch($_FILES['photo']['error'])
-						{
-						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-						      $errors[] = "ErrorFileSizeTooLarge";
-						      break;
-	      					case 3: //uploaded file was only partially uploaded
-						      $errors[] = "ErrorFilePartiallyUploaded";
-						      break;
-						}
-	                }
+                    {
+                        switch($_FILES['photo']['error'])
+                        {
+                            case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+                            case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+                              $errors[] = "ErrorFileSizeTooLarge";
+                                break;
+                                case 3: //uploaded file was only partially uploaded
+                              $errors[] = "ErrorFilePartiallyUploaded";
+                                break;
+                        }
+                    }
                     // Gestion du logo de la société
                 }
                 else
-				{
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
-					{
-						$duplicate_code_error = true;
-						$object->code_fournisseur = null;
-						$object->code_client = null;
-					}
+                {
+                    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+                    {
+                        $duplicate_code_error = true;
+                        $object->code_fournisseur = null;
+                        $object->code_client = null;
+                    }
 
                     setEventMessages($object->error, $object->errors, 'errors');
-                   	$error++;
+                        $error++;
                 }
 
                 if ($result >= 0 && ! $error)
                 {
                     $db->commit();
 
-                	if (! empty($backtopage))
-                	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-                    	$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
-
-                		header("Location: ".$url);
-                    	exit;
-                	}
+                    if (! empty($backtopage))
+                    {
+                        if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+                            header("Location: ".$backtopage);
+                        exit;
+                    }
+                    else
+                    {
+                        $url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+                        if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+                        else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+
+                        header("Location: ".$url);
+                        exit;
+                    }
                 }
                 else
                 {
@@ -646,20 +646,20 @@ 
 
             if ($action == 'update')
             {
-            	$error = 0;
+                $error = 0;
 
                 if (GETPOST('cancel','alpha'))
                 {
-                	if (! empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
+                    if (! empty($backtopage))
+                    {
+                            header("Location: ".$backtopage);
+                        exit;
+                    }
+                    else
+                    {
+                            header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+                        exit;
+                    }
                 }
 
                 // To not set code if third party is not concerned. But if it had values, we keep them.
@@ -674,36 +674,36 @@ 
                     $error++;
                 }
 
-				// Links with users
-				$salesreps = GETPOST('commercial', 'array');
-				$result = $object->setSalesRep($salesreps);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
+                // Links with users
+                $salesreps = GETPOST('commercial', 'array');
+                $result = $object->setSalesRep($salesreps);
+                if ($result < 0)
+                {
+                    $error++;
+                    setEventMessages($object->error, $object->errors, 'errors');
+                }
 
-				// Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
-				if (! $error && !empty($user->rights->categorie->lire))
-				{
-					// Customer categories association
-					$categories = GETPOST( 'custcats', 'array' );
-					$result = $object->setCategories($categories, 'customer');
-					if ($result < 0)
-					{
-						$error++;
-						setEventMessages($object->error, $object->errors, 'errors');
-					}
+                // Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
+                if (! $error && !empty($user->rights->categorie->lire))
+                {
+                    // Customer categories association
+                    $categories = GETPOST( 'custcats', 'array' );
+                    $result = $object->setCategories($categories, 'customer');
+                    if ($result < 0)
+                    {
+                        $error++;
+                        setEventMessages($object->error, $object->errors, 'errors');
+                    }
 
-					// Supplier categories association
-					$categories = GETPOST('suppcats', 'array');
-					$result = $object->setCategories($categories, 'supplier');
-					if ($result < 0)
-					{
-						$error++;
-						setEventMessages($object->error, $object->errors, 'errors');
-					}
-				}
+                    // Supplier categories association
+                    $categories = GETPOST('suppcats', 'array');
+                    $result = $object->setCategories($categories, 'supplier');
+                    if ($result < 0)
+                    {
+                        $error++;
+                        setEventMessages($object->error, $object->errors, 'errors');
+                    }
+                }
 
                 // Logo/Photo save
                 $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
@@ -732,38 +732,38 @@ 
                             }
                             else
                             {
-                            	// Create thumbs
-                            	$object->addThumbs($newfile);
+                                // Create thumbs
+                                $object->addThumbs($newfile);
 
                                 // Index file in database
                                 if (! empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
                                 {
-                                	require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-                                	// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
-                                	deleteFilesIntoDatabaseIndex(dirname($newfile), '', '', 'uploaded', 1);
-                                	// now we index the uploaded logo file
-                                	addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
+                                    require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+                                    // the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
+                                    deleteFilesIntoDatabaseIndex(dirname($newfile), '', '', 'uploaded', 1);
+                                    // now we index the uploaded logo file
+                                    addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
                                 }
                             }
                         }
                     }
                     else
-					{
+                    {
                         $errors[] = "ErrorBadImageFormat";
                     }
                 }
                 else
                 {
-					switch($_FILES['photo']['error'])
-					{
-					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-					    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-					      $errors[] = "ErrorFileSizeTooLarge";
-					      break;
-      					case 3: //uploaded file was only partially uploaded
-					      $errors[] = "ErrorFilePartiallyUploaded";
-					      break;
-					}
+                    switch($_FILES['photo']['error'])
+                    {
+                        case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+                        case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+                          $errors[] = "ErrorFileSizeTooLarge";
+                            break;
+                            case 3: //uploaded file was only partially uploaded
+                          $errors[] = "ErrorFilePartiallyUploaded";
+                            break;
+                    }
                 }
                 // Gestion du logo de la société
 
@@ -772,28 +772,28 @@ 
                 if (! $error && $object->fk_soc > 0)
                 {
 
-                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                	if (! $object->db->query($sql))
-                	{
-                		$error++;
-                		$object->error .= $object->db->lasterror();
-                		setEventMessages($object->error, $object->errors, 'errors');
-                	}
+                    $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+                    $sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
+                    if (! $object->db->query($sql))
+                    {
+                        $error++;
+                        $object->error .= $object->db->lasterror();
+                        setEventMessages($object->error, $object->errors, 'errors');
+                    }
                 }
 
                 if (! $error && ! count($errors))
                 {
-                	if (! empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
+                    if (! empty($backtopage))
+                    {
+                            header("Location: ".$backtopage);
+                        exit;
+                    }
+                    else
+                    {
+                            header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+                        exit;
+                    }
                 }
                 else
                 {
@@ -804,7 +804,7 @@ 
         }
         else
         {
-        	$action = ($action=='add'?'create':'edit');
+            $action = ($action=='add'?'create':'edit');
         }
     }
 
@@ -822,8 +822,8 @@ 
         else
         {
             $langs->load("errors");
-           	setEventMessages($object->error, $object->errors, 'errors');
-           	$error++;
+                setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
             $action='';
         }
     }
@@ -831,15 +831,15 @@ 
     // Set parent company
     if ($action == 'set_thirdparty' && $user->rights->societe->creer)
     {
-    	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany','int'));
+        $object->fetch($socid);
+        $result = $object->set_parent(GETPOST('editparentcompany','int'));
     }
 
     // Set incoterm
     if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
     {
-    	$object->fetch($socid);
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+        $object->fetch($socid);
+        $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
     }
 
     $id=$socid;
@@ -872,7 +872,7 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
+    if ($result <= 0) dol_print_error('',$object->error);
 }
 
 $title=$langs->trans("ThirdParty");
@@ -887,7 +887,7 @@ 
     // -----------------------------------------
     // When used with CANVAS
     // -----------------------------------------
-   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
+        $objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
     $objcanvas->display_canvas($action);							// Show template
 }
 else
@@ -900,9 +900,9 @@ 
         /*
          *  Creation
          */
-		$private=GETPOST("private","int");
-		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
-    	if (empty($private)) $private=0;
+        $private=GETPOST("private","int");
+        if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
+        if (empty($private)) $private=0;
 
         // Load object modCodeTiers
         $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -948,12 +948,12 @@ 
         $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
 
         if(empty($duplicate_code_error)) {
-	        $object->code_client		= GETPOST('customer_code', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
+            $object->code_client		= GETPOST('customer_code', 'alpha');
+            $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
+        }
+        else {
+            setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
         }
-		else {
-			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
-		}
 
         $object->code_fournisseur	= GETPOST('supplier_code', 'alpha');
         $object->address			= GETPOST('address', 'alpha');
@@ -1107,18 +1107,18 @@ 
             print '<div class="hideonsmartphone float">';
             print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
             print '</div>';
-	        print '<label for="radiocompany" class="radiocompany">';
+            print '<label for="radiocompany" class="radiocompany">';
             print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked').'>';
-	        print '&nbsp;';
+            print '&nbsp;';
             print $langs->trans("CreateThirdPartyOnly");
-	        print '</label>';
+            print '</label>';
             print ' &nbsp; &nbsp; ';
-	        print '<label for="radioprivate" class="radioprivate">';
+            print '<label for="radioprivate" class="radioprivate">';
             $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked':'').'>';
-	        $text.='&nbsp;';
-	        $text.= $langs->trans("CreateThirdPartyAndContact");
-	        $htmltext=$langs->trans("ToCreateContactWithSameName");
-	        print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
+            $text.='&nbsp;';
+            $text.= $langs->trans("CreateThirdPartyAndContact");
+            $htmltext=$langs->trans("ToCreateContactWithSameName");
+            print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
             print '</label>';
             print '</div>';
             print "<br>\n";
@@ -1142,28 +1142,28 @@ 
         print '<table class="border" width="100%">';
 
         // Name, firstname
-	    print '<tr><td class="titlefieldcreate">';
+        print '<tr><td class="titlefieldcreate">';
         if ($object->particulier || $private)
         {
-	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
+            print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
         }
         else
-		{
-			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
+        {
+            print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
-	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
-	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
-	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	    {
-		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
-	    }
-	    print '</tr>';
+        print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+        print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
+        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        {
+            print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
+        }
+        print '</tr>';
 
         // If javascript on, we show option individual
         if ($conf->use_javascript_ajax)
         {
             print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
+            print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
             print '</tr>';
             // Title
             print '<tr class="individualline"><td>'.$form->editfieldkey('UserTitle', 'civility_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
@@ -1173,12 +1173,12 @@ 
 
         // Alias names (commercial, trademark or alias names)
         print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	    print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'"></td></tr>';
+        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'"></td></tr>';
 
         // Prospect/Customer
         print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
-	    print '<td class="maxwidthonsmartphone">';
-	    $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
+        print '<td class="maxwidthonsmartphone">';
+        $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
         print '<select class="flat" name="client" id="customerprospect">';
         if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
@@ -1189,7 +1189,7 @@ 
 
         print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
         print '<table class="nobordernopadding"><tr><td>';
-		$tmpcode=$object->code_client;
+        $tmpcode=$object->code_client;
         if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
         print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
         print '</td><td>';
@@ -1199,7 +1199,7 @@ 
         print '</td></tr>';
 
         if ((! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
-        	|| (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
+            || (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
         {
             // Supplier
             print '<tr>';
@@ -1211,19 +1211,19 @@ 
             print '<td>';
             if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
             {
-            	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
+                print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
             }
             print '</td><td>';
             if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
             {
-	            print '<table class="nobordernopadding"><tr><td>';
-	            $tmpcode=$object->code_fournisseur;
-	            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
-	            print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-	            print '</td><td>';
-	            $s=$modCodeFournisseur->getToolTip($langs,$object,1);
-	            print $form->textwithpicto('',$s,1);
-	            print '</td></tr></table>';
+                print '<table class="nobordernopadding"><tr><td>';
+                $tmpcode=$object->code_fournisseur;
+                if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+                print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+                print '</td><td>';
+                $s=$modCodeFournisseur->getToolTip($langs,$object,1);
+                print $form->textwithpicto('',$s,1);
+                print '</td></tr></table>';
             }
             print '</td></tr>';
         }
@@ -1237,13 +1237,13 @@ 
         if (! empty($conf->barcode->enabled))
         {
             print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
+            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
             print '</td></tr>';
         }
 
         // Address
         print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
-	    print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
+        print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
         print $object->address;
         print '</textarea></td></tr>';
 
@@ -1279,43 +1279,43 @@ 
 
         // Email / Web
         print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-	    print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
+        print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
         print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
-	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
+        print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
         if (! empty($conf->socialnetworks->enabled))
         {
-        	// Skype
-        	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-        	{
-        		print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
-				print '<td colspan="3">';
-				print '<input type="text" name="skype" class="minwidth100" maxlength="80" id="skype" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype",'alpha'):$object->skype).'">';
-				print '</td></tr>';
-        	}
-        	// Twitter
-        	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-        	{
-        		print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
-				print '<td colspan="3">';
-				print '<input type="text" name="twitter" class="minwidth100" maxlength="80" id="twitter" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter",'alpha'):$object->twitter).'">';
-				print '</td></tr>';
-        	}
-        	// Facebook
-        	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-        	{
-	        	print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
-				print '<td colspan="3">';
-				print '<input type="text" name="facebook" class="minwidth100" maxlength="80" id="facebook" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook",'alpha'):$object->facebook).'">';
-				print '</td></tr>';
-        	}
+            // Skype
+            if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
+            {
+                print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
+                print '<td colspan="3">';
+                print '<input type="text" name="skype" class="minwidth100" maxlength="80" id="skype" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype",'alpha'):$object->skype).'">';
+                print '</td></tr>';
+            }
+            // Twitter
+            if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
+            {
+                print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
+                print '<td colspan="3">';
+                print '<input type="text" name="twitter" class="minwidth100" maxlength="80" id="twitter" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter",'alpha'):$object->twitter).'">';
+                print '</td></tr>';
+            }
+            // Facebook
+            if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+            {
+                print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
+                print '<td colspan="3">';
+                print '<input type="text" name="facebook" class="minwidth100" maxlength="80" id="facebook" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook",'alpha'):$object->facebook).'">';
+                print '</td></tr>';
+            }
         }
 
         // Phone / Fax
         print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-	    print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
+        print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
         print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-	    print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
+        print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
 
         // Prof ids
         $i=1; $j=0;
@@ -1324,7 +1324,7 @@ 
             $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
             if ($idprof!='-')
             {
-	            $key='idprof'.$i;
+                $key='idprof'.$i;
 
                 if (($j % 2) == 0) print '<tr>';
 
@@ -1423,7 +1423,7 @@ 
 
         // Capital
         print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
-	    print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> ';
+        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> ';
         print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
         if (! empty($conf->global->MAIN_MULTILANGS))
@@ -1434,47 +1434,47 @@ 
             print '</tr>';
         }
 
-		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
-			print '<tr>';
-			print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
-			print '</td></tr>';
-		}
-
-		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-		{
-			$langs->load('categories');
-
-			// Customer
-			//if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
-			print '<tr class="visibleifcustomer"><td class="toptd">' . $form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0) . '</td><td colspan="3">';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
-			print "</td></tr>";
-			//}
-
-			// Supplier
-			//if ($object->fournisseur) {
-			print '<tr class="visibleifsupplier"><td class="toptd">' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . '</td><td colspan="3">';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
-			print "</td></tr>";
-			//}
-		}
-
-		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
-		{
-			print '<tr>';
-			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
-			print '</td></tr>';
-		}
+        // Incoterms
+        if (!empty($conf->incoterm->enabled))
+        {
+            print '<tr>';
+            print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+            print '<td colspan="3" class="maxwidthonsmartphone">';
+            print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+            print '</td></tr>';
+        }
+
+        // Categories
+        if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+        {
+            $langs->load('categories');
+
+            // Customer
+            //if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
+            print '<tr class="visibleifcustomer"><td class="toptd">' . $form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0) . '</td><td colspan="3">';
+            $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+            print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+            print "</td></tr>";
+            //}
+
+            // Supplier
+            //if ($object->fournisseur) {
+            print '<tr class="visibleifsupplier"><td class="toptd">' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . '</td><td colspan="3">';
+            $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
+            print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
+            print "</td></tr>";
+            //}
+        }
+
+        // Multicurrency
+        if (! empty($conf->multicurrency->enabled))
+        {
+            print '<tr>';
+            print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
+            print '<td colspan="3" class="maxwidthonsmartphone">';
+            print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+            print '</td></tr>';
+        }
 
         // Other attributes
         $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
@@ -1482,17 +1482,17 @@ 
         print $hookmanager->resPrint;
         if (empty($reshook))
         {
-        	print $object->showOptionals($extrafields,'edit');
+            print $object->showOptionals($extrafields,'edit');
         }
 
-		// Assign a sale representative
-		print '<tr>';
-		print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
-		print '<td colspan="3" class="maxwidthonsmartphone">';
-		$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
-		// Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record.
-		print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%");
-		print '</td></tr>';
+        // Assign a sale representative
+        print '<tr>';
+        print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+        $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
+        // Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record.
+        print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%");
+        print '</td></tr>';
 
         // Ajout du logo
         print '<tr class="hideonsmartphone">';
@@ -1528,10 +1528,10 @@ 
 
         if ($socid)
         {
-        	$res=$object->fetch_optionals();
+            $res=$object->fetch_optionals();
             //if ($res < 0) { dol_print_error($db); exit; }
 
-	        $head = societe_prepare_head($object);
+            $head = societe_prepare_head($object);
 
             // Load object modCodeTiers
             $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -1569,7 +1569,7 @@ 
                 $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
             }
 
-			$object->oldcopy = clone $object;
+            $object->oldcopy = clone $object;
 
             if (GETPOSTISSET('name'))
             {
@@ -1613,12 +1613,12 @@ 
                 $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
                 $object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
-				//Incoterms
-				if (!empty($conf->incoterm->enabled))
-				{
-					$object->fk_incoterms			= GETPOST('incoterm_id', 'int');
-					$object->location_incoterms		= GETPOST('lcoation_incoterms', 'alpha');
-				}
+                //Incoterms
+                if (!empty($conf->incoterm->enabled))
+                {
+                    $object->fk_incoterms			= GETPOST('incoterm_id', 'int');
+                    $object->location_incoterms		= GETPOST('lcoation_incoterms', 'alpha');
+                }
 
                 //Local Taxes
                 $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
@@ -1630,23 +1630,23 @@ 
                 // We set country_id, and country_code label of the chosen country
                 if ($object->country_id > 0)
                 {
-                	$tmparray=getCountry($object->country_id,'all');
+                    $tmparray=getCountry($object->country_id,'all');
                     $object->country_code	= $tmparray['code'];
                     $object->country		= $tmparray['label'];
                 }
             }
 
             if($object->localtax1_assuj==0){
-            	$sub=0;
+                $sub=0;
             }else{$sub=1;}
             if($object->localtax2_assuj==0){
-            	$sub2=0;
+                $sub2=0;
             }else{$sub2=1;}
 
             if ($conf->use_javascript_ajax)
             {
-            	print "\n".'<script type="text/javascript">';
-            	print '$(document).ready(function () {
+                print "\n".'<script type="text/javascript">';
+                print '$(document).ready(function () {
     			var val='.$sub.';
     			var val2='.$sub2.';
     			if("#localtax1assuj_value".value==undefined){
@@ -1735,20 +1735,20 @@ 
             print '<table class="border" width="100%">';
 
             // Ref/ID
-			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-			{
-		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
-            	print $object->ref;
-            	print '</td></tr>';
-			}
+            if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+            {
+                print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
+                print $object->ref;
+                print '</td></tr>';
+            }
 
             // Name
             print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0, 'string', '', 1).'</td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
+            print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
 
-	        // Alias names (commercial, trademark or alias names)
-	        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
+            // Alias names (commercial, trademark or alias names)
+            print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+            print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
             // Prefix
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -1769,7 +1769,7 @@ 
 
             // Prospect/Customer
             print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
-	        print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
+            print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
             if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
             if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
             if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
@@ -1787,7 +1787,7 @@ 
             }
             else if ($object->codeclient_modifiable())
             {
-            	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
+                print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
             }
             else
             {
@@ -1803,7 +1803,7 @@ 
 
             // Supplier
             if ((! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
-            	|| (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
+                || (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
             {
                 print '<tr>';
                 print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td class="maxwidthonsmartphone">';
@@ -1812,32 +1812,32 @@ 
                 print '<td>';
                 if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
                 {
-                	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
+                    print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
                 }
                 print '</td><td>';
                 if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
                 {
-	                print '<table class="nobordernopadding"><tr><td>';
-	                if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
-	                {
-	                    $tmpcode=$object->code_fournisseur;
-	                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-	                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
-	                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-	                }
-	                else if ($object->codefournisseur_modifiable())
-	                {
-	                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-	                }
-	                else
-	              {
-	                    print $object->code_fournisseur;
-	                    print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
-	                }
-	                print '</td><td>';
-	                $s=$modCodeFournisseur->getToolTip($langs,$object,1);
-	                print $form->textwithpicto('',$s,1);
-	                print '</td></tr></table>';
+                    print '<table class="nobordernopadding"><tr><td>';
+                    if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
+                    {
+                        $tmpcode=$object->code_fournisseur;
+                        if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+                        if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+                        print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+                    }
+                    else if ($object->codefournisseur_modifiable())
+                    {
+                        print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
+                    }
+                    else
+                    {
+                        print $object->code_fournisseur;
+                        print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
+                    }
+                    print '</td><td>';
+                    $s=$modCodeFournisseur->getToolTip($langs,$object,1);
+                    print $form->textwithpicto('',$s,1);
+                    print '</td></tr></table>';
                 }
                 print '</td></tr>';
             }
@@ -1846,7 +1846,7 @@ 
             if (! empty($conf->barcode->enabled))
             {
                 print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
-	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
+                print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
                 print '</td></tr>';
             }
 
@@ -1857,7 +1857,7 @@ 
 
             // Address
             print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
-	        print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+            print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
             print $object->address;
             print '</textarea></td></tr>';
 
@@ -1892,37 +1892,37 @@ 
 
             // EMail / Web
             print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', (! empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-	        print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
+            print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
             print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
-
-	        if (! empty($conf->socialnetworks->enabled))
-	        {
-	        	// Skype
-	        	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-	        	{
-	        		print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
-	        		print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
-	        	}
-	        	// Twitter
-	        	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-	        	{
-	        		print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
-	        		print '<td colspan="3"><input type="text" name="twitter" id="twitter" value="'.$object->twitter.'"></td></tr>';
-	        	}
-	        	// Facebook
-	        	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-	        	{
-	        		print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
-	        		print '<td colspan="3"><input type="text" name="facebook" id="facebook" value="'.$object->facebook.'"></td></tr>';
-	        	}
-	        }
+            print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
+
+            if (! empty($conf->socialnetworks->enabled))
+            {
+                // Skype
+                if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
+                {
+                    print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
+                    print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
+                }
+                // Twitter
+                if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
+                {
+                    print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
+                    print '<td colspan="3"><input type="text" name="twitter" id="twitter" value="'.$object->twitter.'"></td></tr>';
+                }
+                // Facebook
+                if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+                {
+                    print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
+                    print '<td colspan="3"><input type="text" name="facebook" id="facebook" value="'.$object->facebook.'"></td></tr>';
+                }
+            }
 
             // Phone / Fax
             print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-	        print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
+            print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
             print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-	        print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
+            print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
 
             // Prof ids
             $i=1; $j=0;
@@ -1931,13 +1931,13 @@ 
                 $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
                 if ($idprof!='-')
                 {
-	                $key='idprof'.$i;
+                    $key='idprof'.$i;
 
-	                if (($j % 2) == 0) print '<tr>';
+                    if (($j % 2) == 0) print '<tr>';
 
-	                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', ! (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())).'</td><td>';
-	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
+                    $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+                    print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', ! (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())).'</td><td>';
+                    print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                     print '</td>';
                     if (($j % 2) == 1) print '</tr>';
                     $j++;
@@ -2047,9 +2047,9 @@ 
 
             // Capital
             print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
-	        print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
-	        print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+            print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
+            print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
+            print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
 
             // Default language
             if (! empty($conf->global->MAIN_MULTILANGS))
@@ -2063,52 +2063,52 @@ 
             // Incoterms
             if (!empty($conf->incoterm->enabled))
             {
-            	print '<tr>';
-      				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
-            	print '<td colspan="3" class="maxwidthonsmartphone">';
-            	print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
-            	print '</td></tr>';
-            }
-
-			// Categories
-			if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-			{
-				// Customer
-				print '<tr class="visibleifcustomer"><td>' . $form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0) . '</td>';
-				print '<td colspan="3">';
-				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
-				$c = new Categorie($db);
-				$cats = $c->containing($object->id, Categorie::TYPE_CUSTOMER);
-				$arrayselected=array();
-				foreach ($cats as $cat) {
-					$arrayselected[] = $cat->id;
-				}
-				print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
-				print "</td></tr>";
-
-				// Supplier
-				print '<tr class="visibleifsupplier"><td>' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . '</td>';
-				print '<td colspan="3">';
-				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
-				$c = new Categorie($db);
-				$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
-				$arrayselected=array();
-				foreach ($cats as $cat) {
-					$arrayselected[] = $cat->id;
-				}
-				print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
-				print "</td></tr>";
-			}
-
-			// Multicurrency
-			if (! empty($conf->multicurrency->enabled))
-			{
-				print '<tr>';
-				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
-				print '</td></tr>';
-			}
+                print '<tr>';
+                        print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+                print '<td colspan="3" class="maxwidthonsmartphone">';
+                print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+                print '</td></tr>';
+            }
+
+            // Categories
+            if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+            {
+                // Customer
+                print '<tr class="visibleifcustomer"><td>' . $form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0) . '</td>';
+                print '<td colspan="3">';
+                $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
+                $c = new Categorie($db);
+                $cats = $c->containing($object->id, Categorie::TYPE_CUSTOMER);
+                $arrayselected=array();
+                foreach ($cats as $cat) {
+                    $arrayselected[] = $cat->id;
+                }
+                print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+                print "</td></tr>";
+
+                // Supplier
+                print '<tr class="visibleifsupplier"><td>' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . '</td>';
+                print '<td colspan="3">';
+                $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
+                $c = new Categorie($db);
+                $cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
+                $arrayselected=array();
+                foreach ($cats as $cat) {
+                    $arrayselected[] = $cat->id;
+                }
+                print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+                print "</td></tr>";
+            }
+
+            // Multicurrency
+            if (! empty($conf->multicurrency->enabled))
+            {
+                print '<tr>';
+                print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
+                print '<td colspan="3" class="maxwidthonsmartphone">';
+                print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+                print '</td></tr>';
+            }
 
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
@@ -2116,7 +2116,7 @@ 
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-            	print $object->showOptionals($extrafields,'edit');
+                print $object->showOptionals($extrafields,'edit');
             }
 
             // Webservices url/key
@@ -2158,7 +2158,7 @@ 
             print '</table>';
             print '</div>';
 
-	          dol_fiche_end();
+                dol_fiche_end();
 
             print '<div align="center">';
             print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -2171,7 +2171,7 @@ 
     }
     else
     {
-    	/*
+        /*
          * View
          */
 
@@ -2189,19 +2189,19 @@ 
             print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
         }
 
-	    if ($action == 'merge')
-	    {
-		    $formquestion = array(
-			    array(
-				    'name' => 'soc_origin',
-			    	'label' => $langs->trans('MergeOriginThirdparty'),
-				    'type' => 'other',
-				    'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
-			    )
-		    );
-
-		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
-	    }
+        if ($action == 'merge')
+        {
+            $formquestion = array(
+                array(
+                    'name' => 'soc_origin',
+                    'label' => $langs->trans('MergeOriginThirdparty'),
+                    'type' => 'other',
+                    'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
+                )
+            );
+
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
+        }
 
         dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
 
@@ -2216,20 +2216,20 @@ 
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-    	// Prospect/Customer
-    	print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-    	print $object->getLibCustProspStatut();
-    	print '</td></tr>';
+        // Prospect/Customer
+        print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+        print $object->getLibCustProspStatut();
+        print '</td></tr>';
 
-    	// Supplier
-   		if (! empty($conf->fournisseur->enabled) || ! empty($conf->supplier_proposal->enabled))
-    	{
-    		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-    		print yn($object->fournisseur);
-    		print '</td></tr>';
-    	}
+        // Supplier
+            if (! empty($conf->fournisseur->enabled) || ! empty($conf->supplier_proposal->enabled))
+        {
+            print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
+            print yn($object->fournisseur);
+            print '</td></tr>';
+        }
 
-    	// Prefix
+        // Prefix
         if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
         {
             print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
@@ -2267,9 +2267,9 @@ 
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td>'.$object->barcode;
             print '</td>';
-			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
+            if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
             print $htmllogobar;
-			$htmllogobar='';
+            $htmllogobar='';
             print '</tr>';
         }
 
@@ -2282,7 +2282,7 @@ 
             {
                 //if (($j % 2) == 0) print '<tr>';
                 print '<tr>';
-            	print '<td>'.$idprof.'</td><td>';
+                print '<td>'.$idprof.'</td><td>';
                 $key='idprof'.$i;
                 print $object->$key;
                 if ($object->$key)
@@ -2306,108 +2306,108 @@ 
 
         if ($object->fournisseur)
         {
-	        // VAT is used
-	        print '<tr><td>';
-	        print $form->textwithpicto($langs->trans('VATIsUsed'),$langs->trans('VATIsUsedWhenSelling'));
-	        print '</td><td>';
-	        print yn($object->tva_assuj);
-	        print '</td>';
-			print '</tr>';
+            // VAT is used
+            print '<tr><td>';
+            print $form->textwithpicto($langs->trans('VATIsUsed'),$langs->trans('VATIsUsedWhenSelling'));
+            print '</td><td>';
+            print yn($object->tva_assuj);
+            print '</td>';
+            print '</tr>';
         }
 
-		// Local Taxes
+        // Local Taxes
         if ($object->fournisseur || $mysoc->country_code=='ES')
         {
-        	if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
-			    print yn($object->localtax1_assuj);
-			    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
-			    print yn($object->localtax2_assuj);
-			    print '</td></tr>';
-
-			    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax1">';
-			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editRE')
-			        {
-			            print '<td align="left">';
-			            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }
-			        else
-			        {
-			            print '<td>'.$object->localtax1_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
-			    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax2">';
-			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editIRPF'){
-			            print '<td align="left">';
-			            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
-			            print '<td>'.$object->localtax2_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
-			}
-			elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
-			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
-			    print yn($object->localtax1_assuj);
-			    print '</td></tr>';
-			    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax1">';
-			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editRE'){
-			            print '<td align="left">';
-			            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
-			            print '<td>'.$object->localtax1_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
-			}
-			elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
-			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
-			    print yn($object->localtax2_assuj);
-			    print '</td></tr>';
-			    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
-			    {
-
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax2">';
-			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editIRPF'){
-			            print '<td align="left">';
-			            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
-			            print '<td>'.$object->localtax2_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
-			}
+            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+            {
+                print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+                print yn($object->localtax1_assuj);
+                print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+                print yn($object->localtax2_assuj);
+                print '</td></tr>';
+
+                if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+                {
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+                    print '<input type="hidden" name="action" value="set_localtax1">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+                    if($action == 'editRE')
+                    {
+                        print '<td align="left">';
+                        $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+                        print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+                    }
+                    else
+                    {
+                        print '<td>'.$object->localtax1_value.'</td>';
+                    }
+                    print '</tr></form>';
+                }
+                if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+                {
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+                    print '<input type="hidden" name="action" value="set_localtax2">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+                    if($action == 'editIRPF'){
+                        print '<td align="left">';
+                        $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+                        print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+                    }else{
+                        print '<td>'.$object->localtax2_value.'</td>';
+                    }
+                    print '</tr></form>';
+                }
+            }
+            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+            {
+                print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+                print yn($object->localtax1_assuj);
+                print '</td></tr>';
+                if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+                {
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+                    print '<input type="hidden" name="action" value="set_localtax1">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+                    if($action == 'editRE'){
+                        print '<td align="left">';
+                        $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+                        print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+                    }else{
+                        print '<td>'.$object->localtax1_value.'</td>';
+                    }
+                    print '</tr></form>';
+                }
+            }
+            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+            {
+                print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+                print yn($object->localtax2_assuj);
+                print '</td></tr>';
+                if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+                {
+
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+                    print '<input type="hidden" name="action" value="set_localtax2">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+                    if($action == 'editIRPF'){
+                        print '<td align="left">';
+                        $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+                        print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+                    }else{
+                        print '<td>'.$object->localtax2_value.'</td>';
+                    }
+                    print '</tr></form>';
+                }
+            }
         }
 
         // Sale tax code (VAT code)
         print '<tr>';
-		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
+        print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
         if ($object->tva_intra)
         {
             $s='';
@@ -2458,25 +2458,25 @@ 
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-    	// Tags / categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-		{
-			// Customer
-			if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
-				print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
-				print '<td>';
-				print $form->showCategories($object->id, 'customer', 1);
-				print "</td></tr>";
-			}
-
-			// Supplier
-			if ($object->fournisseur) {
-				print '<tr><td>' . $langs->trans("SuppliersCategoriesShort") . '</td>';
-				print '<td>';
-				print $form->showCategories($object->id, 'supplier', 1);
-				print "</td></tr>";
-			}
-		}
+        // Tags / categories
+        if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+        {
+            // Customer
+            if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
+                print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
+                print '<td>';
+                print $form->showCategories($object->id, 'customer', 1);
+                print "</td></tr>";
+            }
+
+            // Supplier
+            if ($object->fournisseur) {
+                print '<tr><td>' . $langs->trans("SuppliersCategoriesShort") . '</td>';
+                print '<td>';
+                print $form->showCategories($object->id, 'supplier', 1);
+                print "</td></tr>";
+            }
+        }
 
         // Legal
         print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
@@ -2503,61 +2503,61 @@ 
         // Incoterms
         if (!empty($conf->incoterm->enabled))
         {
-        	print '<tr><td>';
-        	print '<table width="100%" class="nobordernopadding"><tr><td>';
-        	print $langs->trans('IncotermLabel');
-        	print '<td><td align="right">';
-        	if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
-        	else print '&nbsp;';
-        	print '</td></tr></table>';
-        	print '</td>';
-        	print '<td colspan="3">';
-        	if ($action != 'editincoterm')
-        	{
-        		print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-        	}
-        	else
-        	{
-        		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
-        	}
-        	print '</td></tr>';
-        }
-
-		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
-		{
-			print '<tr>';
-			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
-			print '</td></tr>';
-		}
-
-		// Other attributes
-		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+            print '<tr><td>';
+            print '<table width="100%" class="nobordernopadding"><tr><td>';
+            print $langs->trans('IncotermLabel');
+            print '<td><td align="right">';
+            if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
+            else print '&nbsp;';
+            print '</td></tr></table>';
+            print '</td>';
+            print '<td colspan="3">';
+            if ($action != 'editincoterm')
+            {
+                print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+            }
+            else
+            {
+                print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
+            }
+            print '</td></tr>';
+        }
+
+        // Multicurrency
+        if (! empty($conf->multicurrency->enabled))
+        {
+            print '<tr>';
+            print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
+            print '<td>';
+            print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
+            print '</td></tr>';
+        }
+
+        // Other attributes
+        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         // Parent company
         if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
         {
-        	// Payment term
-        	print '<tr><td>';
-        	print '<table class="nobordernopadding" width="100%"><tr><td>';
-        	print $langs->trans('ParentCompany');
-        	print '</td>';
-        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
-        	print '</tr></table>';
-        	print '</td><td colspan="3">';
-        	if ($action == 'editparentcompany')
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
-        	}
-        	else
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
-        	}
-        	print '</td>';
-        	print '</tr>';
+            // Payment term
+            print '<tr><td>';
+            print '<table class="nobordernopadding" width="100%"><tr><td>';
+            print $langs->trans('ParentCompany');
+            print '</td>';
+            if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+            print '</tr></table>';
+            print '</td><td colspan="3">';
+            if ($action == 'editparentcompany')
+            {
+                $form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
+            }
+            else
+            {
+                $form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
+            }
+            print '</td>';
+            print '</tr>';
         }
 
         // Sales representative
@@ -2591,7 +2591,7 @@ 
         }
 
         print '</table>';
-		print '</div>';
+        print '</div>';
 
         print '</div></div>';
         print '<div style="clear:both"></div>';
@@ -2604,128 +2604,128 @@ 
          */
         if ($action != 'presend')
         {
-	        print '<div class="tabsAction">'."\n";
-
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-			if (empty($reshook))
-			{
-				$at_least_one_email_contact = false;
-				$TContact = $object->contact_array_objects();
-				foreach ($TContact as &$contact)
-				{
-					if (!empty($contact->email))
-					{
-						$at_least_one_email_contact = true;
-						break;
-					}
-				}
+            print '<div class="tabsAction">'."\n";
 
-		        if (! empty($object->email) || $at_least_one_email_contact)
-		        {
-		        	$langs->load("mails");
-		        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-		        }
-		        else
-				{
-		        	$langs->load("mails");
-		       		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
-		        }
-
-		        if ($user->rights->societe->creer)
-		        {
-		            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		        }
-
-		        if ($user->rights->societe->supprimer)
-		        {
-		        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
-		        }
-
-		        if ($user->rights->societe->supprimer)
-		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-		            {
-		                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-		            }
-		            else
-					{
-		                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		            }
-		        }
-			}
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook))
+            {
+                $at_least_one_email_contact = false;
+                $TContact = $object->contact_array_objects();
+                foreach ($TContact as &$contact)
+                {
+                    if (!empty($contact->email))
+                    {
+                        $at_least_one_email_contact = true;
+                        break;
+                    }
+                }
+
+                if (! empty($object->email) || $at_least_one_email_contact)
+                {
+                    $langs->load("mails");
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+                }
+                else
+                {
+                    $langs->load("mails");
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
+                }
+
+                if ($user->rights->societe->creer)
+                {
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+                }
+
+                if ($user->rights->societe->supprimer)
+                {
+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
+                }
 
-	        print '</div>'."\n";
+                if ($user->rights->societe->supprimer)
+                {
+                    if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+                    {
+                        print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+                    }
+                    else
+                    {
+                        print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+                    }
+                }
+            }
+
+            print '</div>'."\n";
         }
 
         //Select mail models is same action as presend
-		if (GETPOST('modelselected')) {
-			$action = 'presend';
-		}
+        if (GETPOST('modelselected')) {
+            $action = 'presend';
+        }
 
-		if ($action != 'presend')
-		{
-			print '<div class="fichecenter"><div class="fichehalfleft">';
+        if ($action != 'presend')
+        {
+            print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	        {
-				print '<a name="builddoc"></a>'; // ancre
+            if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+            {
+                print '<a name="builddoc"></a>'; // ancre
 
-	            /*
+                /*
 	             * Documents generes
 	             */
-	            $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
-	            $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-	            $genallowed=$user->rights->societe->lire;
-	            $delallowed=$user->rights->societe->creer;
+                $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
+                $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+                $genallowed=$user->rights->societe->lire;
+                $delallowed=$user->rights->societe->creer;
 
-	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-	        }
+                print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+            }
 
-			// Subsidiaries list
-			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
-			{
-				$result=show_subsidiaries($conf,$langs,$db,$object);
-			}
+            // Subsidiaries list
+            if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
+            {
+                $result=show_subsidiaries($conf,$langs,$db,$object);
+            }
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+            print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-			$MAXEVENT = 10;
+            $MAXEVENT = 10;
 
-			$morehtmlright = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id.'">';
-			$morehtmlright.= $langs->trans("SeeAll");
-			$morehtmlright.= '</a>';
+            $morehtmlright = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id.'">';
+            $morehtmlright.= $langs->trans("SeeAll");
+            $morehtmlright.= '</a>';
 
-			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright);		// Show all action for thirdparty
+            // List of actions on element
+            include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+            $formactions = new FormActions($db);
+            $somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright);		// Show all action for thirdparty
 
-			print '</div></div></div>';
+            print '</div></div></div>';
 
-			if (! empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
-			{
-				// Contacts list
-				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-				{
-					$result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-				}
+            if (! empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
+            {
+                // Contacts list
+                if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+                {
+                    $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+                }
 
-				// Addresses list
-				if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
-				{
-					$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-				}
-			}
-		}
+                // Addresses list
+                if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+                {
+                    $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+                }
+            }
+        }
 
-		// Presend form
-		$modelmail='thirdparty';
-		$defaulttopic='Information';
-		$diroutput = $conf->societe->dir_output;
-		$trackid = 'thi'.$object->id;
+        // Presend form
+        $modelmail='thirdparty';
+        $defaulttopic='Information';
+        $diroutput = $conf->societe->dir_output;
+        $trackid = 'thi'.$object->id;
 
-		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+        include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
     }
 }
 

Spacing +481 added lines, -481 removed lines

@@ -45,36 +45,36 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
-$langs->loadLangs(array("companies","commercial","bills","banks","users"));
-if (! empty($conf->categorie->enabled)) $langs->load("categories");
-if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
+$langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
+if (!empty($conf->categorie->enabled)) $langs->load("categories");
+if (!empty($conf->incoterm->enabled)) $langs->load("incoterm");
+if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-$mesg=''; $error=0; $errors=array();
+$mesg = ''; $error = 0; $errors = array();
 
-$action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
-$cancel		= GETPOST('cancel','alpha');
-$backtopage	= GETPOST('backtopage','alpha');
-$confirm	= GETPOST('confirm','alpha');
+$action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
+$cancel		= GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+$confirm	= GETPOST('confirm', 'alpha');
 
-$socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if (empty($socid) && $action == 'view') $action='create';
+$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+if (empty($socid) && $action == 'view') $action = 'create';
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartycard','globalcard'));
+$hookmanager->initHooks(array('thirdpartycard', 'globalcard'));
 
 if ($socid > 0) $object->fetch($socid);
 
-if (! ($object->id > 0) && $action == 'view')
+if (!($object->id > 0) && $action == 'view')
 {
 	$langs->load("errors");
 	print($langs->trans('ErrorRecordNotFound'));
@@ -83,9 +83,9 @@ 
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $object->getCanvas($socid);
-$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
+$canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
+$objcanvas = null;
+if (!empty($canvas))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
     $objcanvas = new Canvas($db, $action);
@@ -100,16 +100,16 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
     if ($cancel)
     {
-        $action='';
-        if (! empty($backtopage))
+        $action = '';
+        if (!empty($backtopage))
         {
             header("Location: ".$backtopage);
             exit;
@@ -145,7 +145,7 @@ 
 				// Recopy some data
 				$object->client = $object->client | $soc_origin->client;
 				$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-				$listofproperties=array(
+				$listofproperties = array(
 					'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'url', 'barcode',
 					'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 					'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
@@ -159,7 +159,7 @@ 
 				}
 
 				// Concat some data
-				$listofproperties=array(
+				$listofproperties = array(
 				    'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
@@ -181,12 +181,12 @@ 
 
 				$custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id');
 				$custcats = $static_cat->containing($object->id, 'customer', 'id');
-				$custcats = array_merge($custcats,$custcats_ori);
+				$custcats = array_merge($custcats, $custcats_ori);
 				$object->setCategories($custcats, 'customer');
 
 				$suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id');
 				$suppcats = $static_cat->containing($object->id, 'supplier', 'id');
-				$suppcats = array_merge($suppcats,$suppcats_ori);
+				$suppcats = array_merge($suppcats, $suppcats_ori);
 				$object->setCategories($suppcats, 'supplier');
 
 				// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
@@ -209,7 +209,7 @@ 
 				}
 
 				// Move links
-				if (! $error)
+				if (!$error)
 				{
 					$objects = array(
 						'Adherent' => '/adherents/class/adherent.class.php',
@@ -249,7 +249,7 @@ 
 				}
 
 				// External modules should update their ones too
-				if (! $error)
+				if (!$error)
 				{
 					$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
 						'soc_origin' => $soc_origin->id,
@@ -264,12 +264,12 @@ 
 				}
 
 
-				if (! $error)
+				if (!$error)
 				{
-					$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+					$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 					// Call trigger
-					$result=$object->call_trigger('COMPANY_MODIFY',$user);
+					$result = $object->call_trigger('COMPANY_MODIFY', $user);
 					if ($result < 0)
 					{
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -305,28 +305,28 @@ 
     if (GETPOST('getcustomercode'))
     {
         // We defined value code_client
-        $_POST["customer_code"]="Acompleter";
+        $_POST["customer_code"] = "Acompleter";
     }
 
     if (GETPOST('getsuppliercode'))
     {
         // We defined value code_fournisseur
-        $_POST["supplier_code"]="Acompleter";
+        $_POST["supplier_code"] = "Acompleter";
     }
 
-    if($action=='set_localtax1')
+    if ($action == 'set_localtax1')
     {
     	//obtidre selected del combobox
-    	$value=GETPOST('lt1');
+    	$value = GETPOST('lt1');
     	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+    	$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
-    if($action=='set_localtax2')
+    if ($action == 'set_localtax2')
     {
     	//obtidre selected del combobox
-    	$value=GETPOST('lt2');
+    	$value = GETPOST('lt2');
     	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+    	$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
 
     if ($action == 'update_extras') {
@@ -336,10 +336,10 @@ 
 
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
         if ($ret < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
         	$result = $object->insertExtraFields('COMPANY_MODIFY');
         	if ($result < 0)
@@ -353,12 +353,12 @@ 
     }
 
     // Add new or update third party
-    if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
+    if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
     && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
     {
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        if (! GETPOST('name'))
+        if (!GETPOST('name'))
         {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
             $error++;
@@ -374,41 +374,41 @@ 
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
         	if ($action == 'update')
 	        {
-	        	$ret=$object->fetch($socid);
+	        	$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
 	        }
-			else $object->canvas=$canvas;
+			else $object->canvas = $canvas;
 
 	        if (GETPOST("private") == 1)	// Ask to create a contact
 	        {
 	            $object->particulier		= GETPOST("private");
 
-	            $object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
-	            $object->civility_id		= GETPOST('civility_id');	// Note: civility id is a code, not an int
+	            $object->name = dolGetFirstLastname(GETPOST('firstname', 'alpha'), GETPOST('name', 'alpha'));
+	            $object->civility_id		= GETPOST('civility_id'); // Note: civility id is a code, not an int
 	            // Add non official properties
-	            $object->name_bis			= GETPOST('name','alpha');
-	            $object->firstname			= GETPOST('firstname','alpha');
+	            $object->name_bis = GETPOST('name', 'alpha');
+	            $object->firstname = GETPOST('firstname', 'alpha');
 	        }
 	        else
 	        {
-	            $object->name				= GETPOST('name', 'alpha');
+	            $object->name = GETPOST('name', 'alpha');
 	        }
-	        $object->entity					= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
-	        $object->name_alias				= GETPOST('name_alias');
+	        $object->entity					= (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
+	        $object->name_alias = GETPOST('name_alias');
 	        $object->address				= GETPOST('address');
-	        $object->zip					= GETPOST('zipcode', 'alpha');
-	        $object->town					= GETPOST('town', 'alpha');
-	        $object->country_id				= GETPOST('country_id', 'int');
+	        $object->zip = GETPOST('zipcode', 'alpha');
+	        $object->town = GETPOST('town', 'alpha');
+	        $object->country_id = GETPOST('country_id', 'int');
 	        $object->state_id				= GETPOST('state_id', 'int');
 	        $object->skype					= GETPOST('skype', 'alpha');
-	        $object->twitter				= GETPOST('twitter', 'alpha');
+	        $object->twitter = GETPOST('twitter', 'alpha');
 	        $object->facebook				= GETPOST('facebook', 'alpha');
 	        $object->phone					= GETPOST('phone', 'alpha');
-	        $object->fax					= GETPOST('fax','alpha');
+	        $object->fax					= GETPOST('fax', 'alpha');
 	        $object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
 	        $object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 	        $object->idprof1				= trim(GETPOST('idprof1', 'alpha'));
@@ -418,14 +418,14 @@ 
 	        $object->idprof5				= trim(GETPOST('idprof5', 'alpha'));
 	        $object->idprof6				= trim(GETPOST('idprof6', 'alpha'));
 	        $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
-	        $object->code_client			= GETPOSTISSET('customer_code')?GETPOST('customer_code', 'alpha'):GETPOST('code_client', 'alpha');
-	        $object->code_fournisseur		= GETPOSTISSET('supplier_code')?GETPOST('supplier_code', 'alpha'):GETPOST('code_fournisseur', 'alpha');
+	        $object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
+	        $object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
 	        $object->capital				= GETPOST('capital', 'alpha');
 	        $object->barcode				= GETPOST('barcode', 'alpha');
 
 	        $object->tva_intra				= GETPOST('tva_intra', 'alpha');
 	        $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-	        $object->status					= GETPOST('status', 'alpha');
+	        $object->status = GETPOST('status', 'alpha');
 
 	        // Local Taxes
 	        $object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
@@ -434,17 +434,17 @@ 
 	        $object->localtax1_value		= GETPOST('lt1', 'alpha');
 	        $object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-	        $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+	        $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
 	        $object->effectif_id			= GETPOST('effectif_id', 'int');
-	        $object->typent_id				= GETPOST('typent_id','int');
+	        $object->typent_id = GETPOST('typent_id', 'int');
 
-	        $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
+	        $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-	        $object->client					= GETPOST('client', 'int');
+	        $object->client = GETPOST('client', 'int');
 	        $object->fournisseur			= GETPOST('fournisseur', 'int');
 
-	        $object->commercial_id			= GETPOST('commercial_id', 'int');
-	        $object->default_lang			= GETPOST('default_lang');
+	        $object->commercial_id = GETPOST('commercial_id', 'int');
+	        $object->default_lang = GETPOST('default_lang');
 
 	        // Webservices url/key
 	        $object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -453,8 +453,8 @@ 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
 			{
-				$object->fk_incoterms		= GETPOST('incoterm_id', 'int');
-				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
+				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			}
 
 			// Multicurrency
@@ -464,53 +464,53 @@ 
 			}
 
 	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 			if ($ret < 0)
 			{
 				 $error++;
 			}
 
 	        if (GETPOST('deletephoto')) $object->logo = '';
-	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        else if (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 
 	        // Check parameters
-	        if (! GETPOST('cancel','alpha'))
+	        if (!GETPOST('cancel', 'alpha'))
 	        {
-	            if (! empty($object->email) && ! isValidEMail($object->email))
+	            if (!empty($object->email) && !isValidEMail($object->email))
 	            {
 	                $langs->load("errors");
 	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
+	                setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
 	            }
-	            if (! empty($object->url) && ! isValidUrl($object->url))
+	            if (!empty($object->url) && !isValidUrl($object->url))
 	            {
 	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
+	                setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
 	            }
-	            if (! empty($object->webservices_url)) {
+	            if (!empty($object->webservices_url)) {
 	                //Check if has transport, without any the soap client will give error
 	                if (strpos($object->webservices_url, "http") === false)
 	                {
 	                    $object->webservices_url = "http://".$object->webservices_url;
 	                }
-	                if (! isValidUrl($object->webservices_url)) {
+	                if (!isValidUrl($object->webservices_url)) {
 	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
+	                    $error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
 	                }
 	            }
 
 	            // We set country_id, country_code and country for the selected country
-	            $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
+	            $object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
 	            if ($object->country_id)
 	            {
-	            	$tmparray=getCountry($object->country_id,'all');
-	            	$object->country_code=$tmparray['code'];
-	            	$object->country=$tmparray['label'];
+	            	$tmparray = getCountry($object->country_id, 'all');
+	            	$object->country_code = $tmparray['code'];
+	            	$object->country = $tmparray['label'];
 	            }
 	        }
         }
 
-        if (! $error)
+        if (!$error)
         {
             if ($action == 'add')
             {
@@ -518,8 +518,8 @@ 
 
                 $db->begin();
 
-                if (empty($object->client))      $object->code_client='';
-                if (empty($object->fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client))      $object->code_client = '';
+                if (empty($object->fournisseur)) $object->code_fournisseur = '';
 
                 $result = $object->create($user);
 
@@ -528,7 +528,7 @@ 
 					if ($object->particulier)
 					{
 						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
-						$result=$object->create_individual($user);
+						$result = $object->create_individual($user);
 						if ($result < 0)
 						{
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -574,10 +574,10 @@ 
 
                             if (@is_dir($dir))
                             {
-                                $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                                $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                                 $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                                if (! $result > 0)
+                                if (!$result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
                                 }
@@ -591,7 +591,7 @@ 
                     }
                     else
 					{
-						switch($_FILES['photo']['error'])
+						switch ($_FILES['photo']['error'])
 						{
 						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 						    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
@@ -617,21 +617,21 @@ 
                    	$error++;
                 }
 
-                if ($result >= 0 && ! $error)
+                if ($result >= 0 && !$error)
                 {
                     $db->commit();
 
-                	if (! empty($backtopage))
+                	if (!empty($backtopage))
                 	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+                	    if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id;
                		    header("Location: ".$backtopage);
                     	exit;
                 	}
                 	else
                 	{
-                    	$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+                    	$url = $_SERVER["PHP_SELF"]."?socid=".$object->id;
+                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+                    	else if ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
 
                 		header("Location: ".$url);
                     	exit;
@@ -640,7 +640,7 @@ 
                 else
                 {
                     $db->rollback();
-                    $action='create';
+                    $action = 'create';
                 }
             }
 
@@ -648,9 +648,9 @@ 
             {
             	$error = 0;
 
-                if (GETPOST('cancel','alpha'))
+                if (GETPOST('cancel', 'alpha'))
                 {
-                	if (! empty($backtopage))
+                	if (!empty($backtopage))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
@@ -663,12 +663,12 @@ 
                 }
 
                 // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client='';
-                if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
+                if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
                 //var_dump($object);exit;
 
                 $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
-                if ($result <=  0)
+                if ($result <= 0)
                 {
                     setEventMessages($object->error, $object->errors, 'errors');
                     $error++;
@@ -684,10 +684,10 @@ 
 				}
 
 				// Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
-				if (! $error && !empty($user->rights->categorie->lire))
+				if (!$error && !empty($user->rights->categorie->lire))
 				{
 					// Customer categories association
-					$categories = GETPOST( 'custcats', 'array' );
+					$categories = GETPOST('custcats', 'array');
 					$result = $object->setCategories($categories, 'customer');
 					if ($result < 0)
 					{
@@ -710,8 +710,8 @@ 
                 $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
                 if (GETPOST('deletephoto') && $object->logo)
                 {
-                    $fileimg=$dir.'/'.$object->logo;
-                    $dirthumbs=$dir.'/thumbs';
+                    $fileimg = $dir.'/'.$object->logo;
+                    $dirthumbs = $dir.'/thumbs';
                     dol_delete_file($fileimg);
                     dol_delete_dir_recursive($dirthumbs);
                 }
@@ -723,10 +723,10 @@ 
 
                         if (@is_dir($dir))
                         {
-                            $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                            $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                             $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                            if (! $result > 0)
+                            if (!$result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
                             }
@@ -736,9 +736,9 @@ 
                             	$object->addThumbs($newfile);
 
                                 // Index file in database
-                                if (! empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
+                                if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
                                 {
-                                	require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+                                	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
                                 	// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
                                 	deleteFilesIntoDatabaseIndex(dirname($newfile), '', '', 'uploaded', 1);
                                 	// now we index the uploaded logo file
@@ -754,7 +754,7 @@ 
                 }
                 else
                 {
-					switch($_FILES['photo']['error'])
+					switch ($_FILES['photo']['error'])
 					{
 					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 					    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
@@ -769,12 +769,12 @@ 
 
 
                 // Update linked member
-                if (! $error && $object->fk_soc > 0)
+                if (!$error && $object->fk_soc > 0)
                 {
 
                 	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                	if (! $object->db->query($sql))
+                	$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
+                	if (!$object->db->query($sql))
                 	{
                 		$error++;
                 		$object->error .= $object->db->lasterror();
@@ -782,9 +782,9 @@ 
                 	}
                 }
 
-                if (! $error && ! count($errors))
+                if (!$error && !count($errors))
                 {
-                	if (! empty($backtopage))
+                	if (!empty($backtopage))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
@@ -798,13 +798,13 @@ 
                 else
                 {
                     $object->id = $socid;
-                    $action= "edit";
+                    $action = "edit";
                 }
             }
         }
         else
         {
-        	$action = ($action=='add'?'create':'edit');
+        	$action = ($action == 'add' ? 'create' : 'edit');
         }
     }
 
@@ -824,7 +824,7 @@ 
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
            	$error++;
-            $action='';
+            $action = '';
         }
     }
 
@@ -832,7 +832,7 @@ 
     if ($action == 'set_thirdparty' && $user->rights->societe->creer)
     {
     	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany','int'));
+    	$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
     }
 
     // Set incoterm
@@ -842,20 +842,20 @@ 
     	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
     }
 
-    $id=$socid;
+    $id = $socid;
     $object->fetch($socid);
 
     // Actions to send emails
-    $trigger_name='COMPANY_SENTBYMAIL';
-    $paramname='socid';
-    $mode='emailfromthirdparty';
-    $trackid='thi'.$object->id;
+    $trigger_name = 'COMPANY_SENTBYMAIL';
+    $paramname = 'socid';
+    $mode = 'emailfromthirdparty';
+    $trackid = 'thi'.$object->id;
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
     // Actions to build doc
     $id = $socid;
     $upload_dir = $conf->societe->dir_output;
-    $permissioncreate=$user->rights->societe->creer;
+    $permissioncreate = $user->rights->societe->creer;
     include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
@@ -871,24 +871,24 @@ 
 
 if ($socid > 0 && empty($object->id))
 {
-    $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
+    $result = $object->fetch($socid);
+	if ($result <= 0) dol_print_error('', $object->error);
 }
 
-$title=$langs->trans("ThirdParty");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$langs->trans('Card');
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
     // -----------------------------------------
     // When used with CANVAS
     // -----------------------------------------
-   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
-    $objcanvas->display_canvas($action);							// Show template
+   	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
+    $objcanvas->display_canvas($action); // Show template
 }
 else
 {
@@ -900,68 +900,68 @@ 
         /*
          *  Creation
          */
-		$private=GETPOST("private","int");
-		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
-    	if (empty($private)) $private=0;
+		$private = GETPOST("private", "int");
+		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !isset($_GET['private']) && !isset($_POST['private'])) $private = 1;
+    	if (empty($private)) $private = 0;
 
         // Load object modCodeTiers
-        $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
         if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
         {
-            $module = substr($module, 0, dol_strlen($module)-4);
+            $module = substr($module, 0, dol_strlen($module) - 4);
         }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
         foreach ($dirsociete as $dirroot)
         {
-            $res=dol_include_once($dirroot.$module.'.php');
+            $res = dol_include_once($dirroot.$module.'.php');
             if ($res) break;
         }
         $modCodeClient = new $module;
         // Load object modCodeFournisseur
-        $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
         if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
         {
-            $module = substr($module, 0, dol_strlen($module)-4);
+            $module = substr($module, 0, dol_strlen($module) - 4);
         }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
         foreach ($dirsociete as $dirroot)
         {
-            $res=dol_include_once($dirroot.$module.'.php');
+            $res = dol_include_once($dirroot.$module.'.php');
             if ($res) break;
         }
         $modCodeFournisseur = new $module;
 
         // Define if customer/prospect or supplier status is set or not
-        if (GETPOST("type")!='f')
+        if (GETPOST("type") != 'f')
         {
-            $object->client=-1;
-            if (! empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT))  { $object->client=3; }
+            $object->client = -1;
+            if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
         }
-        if (GETPOST("type")=='c')  { $object->client=3; }   // Prospect / Customer
-        if (GETPOST("type")=='p')  { $object->client=2; }
-        if (! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || (GETPOST("type")=='' && ! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT))))  { $object->fournisseur=1; }
+        if (GETPOST("type") == 'c') { $object->client = 3; }   // Prospect / Customer
+        if (GETPOST("type") == 'p') { $object->client = 2; }
+        if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
 
-        $object->name				= GETPOST('name', 'alpha');
-        $object->firstname			= GETPOST('firstname', 'alpha');
+        $object->name = GETPOST('name', 'alpha');
+        $object->firstname = GETPOST('firstname', 'alpha');
         $object->particulier		= $private;
         $object->prefix_comm		= GETPOST('prefix_comm');
-        $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
+        $object->client = GETPOST('client') ?GETPOST('client') : $object->client;
 
-        if(empty($duplicate_code_error)) {
+        if (empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('customer_code', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
+	        $object->fournisseur		= GETPOST('fournisseur') ?GETPOST('fournisseur') : $object->fournisseur;
         }
 		else {
-			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
+			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), '', 'warnings');
 		}
 
-        $object->code_fournisseur	= GETPOST('supplier_code', 'alpha');
-        $object->address			= GETPOST('address', 'alpha');
-        $object->zip				= GETPOST('zipcode', 'alpha');
-        $object->town				= GETPOST('town', 'alpha');
+        $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+        $object->address = GETPOST('address', 'alpha');
+        $object->zip = GETPOST('zipcode', 'alpha');
+        $object->town = GETPOST('town', 'alpha');
         $object->state_id			= GETPOST('state_id', 'int');
         $object->skype				= GETPOST('skype', 'alpha');
-        $object->twitter			= GETPOST('twitter', 'alpha');
+        $object->twitter = GETPOST('twitter', 'alpha');
         $object->facebook			= GETPOST('facebook', 'alpha');
         $object->phone				= GETPOST('phone', 'alpha');
         $object->fax				= GETPOST('fax', 'alpha');
@@ -975,30 +975,30 @@ 
         $object->idprof4			= GETPOST('idprof4', 'alpha');
         $object->idprof5			= GETPOST('idprof5', 'alpha');
         $object->idprof6			= GETPOST('idprof6', 'alpha');
-        $object->typent_id			= GETPOST('typent_id', 'int');
+        $object->typent_id = GETPOST('typent_id', 'int');
         $object->effectif_id		= GETPOST('effectif_id', 'int');
         $object->civility_id		= GETPOST('civility_id', 'int');
 
-        $object->tva_assuj			= GETPOST('assujtva_value', 'int');
-        $object->status				= GETPOST('status', 'int');
+        $object->tva_assuj = GETPOST('assujtva_value', 'int');
+        $object->status = GETPOST('status', 'int');
 
         //Local Taxes
         $object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
         $object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
 
-        $object->localtax1_value	=GETPOST('lt1', 'int');
-        $object->localtax2_value	=GETPOST('lt2', 'int');
+        $object->localtax1_value	= GETPOST('lt1', 'int');
+        $object->localtax2_value	= GETPOST('lt2', 'int');
 
-        $object->tva_intra			= GETPOST('tva_intra', 'alpha');
+        $object->tva_intra = GETPOST('tva_intra', 'alpha');
 
-        $object->commercial_id		= GETPOST('commercial_id', 'int');
-        $object->default_lang		= GETPOST('default_lang');
+        $object->commercial_id = GETPOST('commercial_id', 'int');
+        $object->default_lang = GETPOST('default_lang');
 
-        $object->logo = (isset($_FILES['photo'])?dol_sanitizeFileName($_FILES['photo']['name']):'');
+        $object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
         // Gestion du logo de la société
         $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-        $file_OK = (isset($_FILES['photo'])?is_uploaded_file($_FILES['photo']['tmp_name']):false);
+        $file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
         if ($file_OK)
         {
             if (image_format_supported($_FILES['photo']['name']))
@@ -1007,10 +1007,10 @@ 
 
                 if (@is_dir($dir))
                 {
-                    $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                    $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                     $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                    if (! $result > 0)
+                    if (!$result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
                     }
@@ -1024,20 +1024,20 @@ 
         }
 
         // We set country_id, country_code and country for the selected country
-        $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
+        $object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
         if ($object->country_id)
         {
-            $tmparray=getCountry($object->country_id,'all');
-            $object->country_code=$tmparray['code'];
-            $object->country=$tmparray['label'];
+            $tmparray = getCountry($object->country_id, 'all');
+            $object->country_code = $tmparray['code'];
+            $object->country = $tmparray['label'];
         }
-        $object->forme_juridique_code=GETPOST('forme_juridique_code');
+        $object->forme_juridique_code = GETPOST('forme_juridique_code');
         /* Show create form */
 
-        $linkback="";
-        print load_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png');
+        $linkback = "";
+        print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'title_companies.png');
 
-        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
+        if (!empty($conf->use_javascript_ajax) && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
         {
             print "\n".'<script type="text/javascript">';
             print '$(document).ready(function () {
@@ -1070,7 +1070,7 @@ 
 						});
 						function init_customer_categ() {
 								console.log("is customer or prospect = "+jQuery("#customerprospect").val());
-								if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || '.(empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER)?'1':'0').'))
+								if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || '.(empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER) ? '1' : '0').'))
 								{
 									jQuery(".visibleifcustomer").hide();
 								}
@@ -1108,31 +1108,31 @@ 
             print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
             print '</div>';
 	        print '<label for="radiocompany" class="radiocompany">';
-            print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked').'>';
+            print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private ? '' : ' checked').'>';
 	        print '&nbsp;';
             print $langs->trans("CreateThirdPartyOnly");
 	        print '</label>';
             print ' &nbsp; &nbsp; ';
 	        print '<label for="radioprivate" class="radioprivate">';
-            $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked':'').'>';
-	        $text.='&nbsp;';
-	        $text.= $langs->trans("CreateThirdPartyAndContact");
-	        $htmltext=$langs->trans("ToCreateContactWithSameName");
+            $text = '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private ? ' checked' : '').'>';
+	        $text .= '&nbsp;';
+	        $text .= $langs->trans("CreateThirdPartyAndContact");
+	        $htmltext = $langs->trans("ToCreateContactWithSameName");
 	        print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
             print '</label>';
             print '</div>';
             print "<br>\n";
         }
 
-        dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+        dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-        print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">';		// Chrome ignor autocomplete
+        print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">'; // Chrome ignor autocomplete
 
         print '<input type="hidden" name="action" value="add">';
         print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="private" value='.$object->particulier.'>';
-        print '<input type="hidden" name="type" value='.GETPOST("type",'alpha').'>';
+        print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
         print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
         print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
         if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
@@ -1145,15 +1145,15 @@ 
 	    print '<tr><td class="titlefieldcreate">';
         if ($object->particulier || $private)
         {
-	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
+	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
         }
         else
 		{
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
-	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
 	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
-	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	    {
 		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
 	    }
@@ -1178,51 +1178,51 @@ 
         // Prospect/Customer
         print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 	    print '<td class="maxwidthonsmartphone">';
-	    $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
+	    $selected = GETPOST('client', 'int') != '' ?GETPOST('client', 'int') : $object->client;
         print '<select class="flat" name="client" id="customerprospect">';
         if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
-        print '<option value="0"'.((string) $selected == '0'?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
+        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
+        print '<option value="0"'.((string) $selected == '0' ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
         print '</select></td>';
 
         print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
         print '<table class="nobordernopadding"><tr><td>';
-		$tmpcode=$object->code_client;
-        if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+		$tmpcode = $object->code_client;
+        if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
         print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
         print '</td><td>';
-        $s=$modCodeClient->getToolTip($langs,$object,0);
-        print $form->textwithpicto('',$s,1);
+        $s = $modCodeClient->getToolTip($langs, $object, 0);
+        print $form->textwithpicto('', $s, 1);
         print '</td></tr></table>';
         print '</td></tr>';
 
-        if ((! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
-        	|| (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
+        if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+        	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
         {
             // Supplier
             print '<tr>';
             print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
             $default = -1;
-            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
-            print $form->selectyesno("fournisseur", (GETPOST('fournisseur','int')!=''?GETPOST('fournisseur','int'):(GETPOST("type",'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type",'alpha') == '' ? 1 : 0));
+            if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
+            print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ?GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
             print '</td>';
             print '<td>';
-            if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
+            if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
             {
             	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
             }
             print '</td><td>';
-            if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
+            if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
             {
 	            print '<table class="nobordernopadding"><tr><td>';
-	            $tmpcode=$object->code_fournisseur;
-	            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+	            $tmpcode = $object->code_fournisseur;
+	            if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
 	            print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
 	            print '</td><td>';
-	            $s=$modCodeFournisseur->getToolTip($langs,$object,1);
-	            print $form->textwithpicto('',$s,1);
+	            $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+	            print $form->textwithpicto('', $s, 1);
 	            print '</td></tr></table>';
             }
             print '</td></tr>';
@@ -1230,11 +1230,11 @@ 
 
         // Status
         print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-        print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1);
+        print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
         print '</td></tr>';
 
         // Barcode
-        if (! empty($conf->barcode->enabled))
+        if (!empty($conf->barcode->enabled))
         {
             print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
@@ -1249,21 +1249,21 @@ 
 
         // Zip / Town
         print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
-        print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+        print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
         print '</td><td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
-        print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+        print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
         print '</td></tr>';
 
         // Country
         print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-        print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id));
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td></tr>';
 
         // State
         if (empty($conf->global->SOCIETE_DISABLE_STATE))
         {
-            if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
             {
                 print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
@@ -1272,7 +1272,7 @@ 
                 print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
-            if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
+            if ($object->country_id) print $formcompany->select_state($object->state_id, $object->country_code);
             else print $countrynotdefined;
             print '</td></tr>';
         }
@@ -1283,30 +1283,30 @@ 
         print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
 	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
-        if (! empty($conf->socialnetworks->enabled))
+        if (!empty($conf->socialnetworks->enabled))
         {
         	// Skype
-        	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
+        	if (!empty($conf->global->SOCIALNETWORKS_SKYPE))
         	{
         		print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
 				print '<td colspan="3">';
-				print '<input type="text" name="skype" class="minwidth100" maxlength="80" id="skype" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype",'alpha'):$object->skype).'">';
+				print '<input type="text" name="skype" class="minwidth100" maxlength="80" id="skype" value="'.dol_escape_htmltag(GETPOSTISSET("skype") ?GETPOST("skype", 'alpha') : $object->skype).'">';
 				print '</td></tr>';
         	}
         	// Twitter
-        	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
+        	if (!empty($conf->global->SOCIALNETWORKS_TWITTER))
         	{
         		print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
 				print '<td colspan="3">';
-				print '<input type="text" name="twitter" class="minwidth100" maxlength="80" id="twitter" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter",'alpha'):$object->twitter).'">';
+				print '<input type="text" name="twitter" class="minwidth100" maxlength="80" id="twitter" value="'.dol_escape_htmltag(GETPOSTISSET("twitter") ?GETPOST("twitter", 'alpha') : $object->twitter).'">';
 				print '</td></tr>';
         	}
         	// Facebook
-        	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+        	if (!empty($conf->global->SOCIALNETWORKS_FACEBOOK))
         	{
 	        	print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
 				print '<td colspan="3">';
-				print '<input type="text" name="facebook" class="minwidth100" maxlength="80" id="facebook" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook",'alpha'):$object->facebook).'">';
+				print '<input type="text" name="facebook" class="minwidth100" maxlength="80" id="facebook" value="'.dol_escape_htmltag(GETPOSTISSET("facebook") ?GETPOST("facebook", 'alpha') : $object->facebook).'">';
 				print '</td></tr>';
         	}
         }
@@ -1318,18 +1318,18 @@ 
 	    print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
 
         // Prof ids
-        $i=1; $j=0;
+        $i = 1; $j = 0;
         while ($i <= 6)
         {
-            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-            if ($idprof!='-')
+            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+            if ($idprof != '-')
             {
-	            $key='idprof'.$i;
+	            $key = 'idprof'.$i;
 
                 if (($j % 2) == 0) print '<tr>';
 
-                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory)?0:1)).'</td><td>';
+                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
+                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
 
                 print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                 print '</td>';
@@ -1343,7 +1343,7 @@ 
         // Vat is used
         print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
         print '<td>';
-        print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value')?GETPOST('assujtva_value','int'):1, 1);     // Assujeti par defaut en creation
+        print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
         print '</td>';
         print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
         print '<td class="nowrap">';
@@ -1351,9 +1351,9 @@ 
 
         if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
         {
-            $s.=' ';
+            $s .= ' ';
 
-            if (! empty($conf->use_javascript_ajax))
+            if (!empty($conf->use_javascript_ajax))
             {
                 print "\n";
                 print '<script language="JavaScript" type="text/javascript">';
@@ -1362,12 +1362,12 @@ 
                 print "}\n";
                 print '</script>';
                 print "\n";
-                $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
             }
             else
             {
-                $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
         print $s;
@@ -1376,36 +1376,36 @@ 
 
         // Local Taxes
         //TODO: Place into a function to control showing by country or study better option
-        if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+        if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
         {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
-            print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
+            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+            print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
+            print '</td><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+            print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
         }
-        elseif($mysoc->localtax1_assuj=="1")
+        elseif ($mysoc->localtax1_assuj == "1")
         {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
+            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+            print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
             print '</td></tr>';
         }
-        elseif($mysoc->localtax2_assuj=="1")
+        elseif ($mysoc->localtax2_assuj == "1")
         {
-            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
+            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+            print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
         }
 
         // Type - Size
         print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">'."\n";
-        $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+        $sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td>';
         print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td></tr>';
 
         // Legal Form
@@ -1426,10 +1426,10 @@ 
 	    print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> ';
         print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
-        if (! empty($conf->global->MAIN_MULTILANGS))
+        if (!empty($conf->global->MAIN_MULTILANGS))
         {
             print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
-            print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1,0,0,'maxwidth200onsmartphone');
+            print $formadmin->select_language(($object->default_lang ? $object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
             print '</td>';
             print '</tr>';
         }
@@ -1440,18 +1440,18 @@ 
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
 	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 			print '</td></tr>';
 		}
 
 		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 		{
 			$langs->load('categories');
 
 			// Customer
 			//if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
-			print '<tr class="visibleifcustomer"><td class="toptd">' . $form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0) . '</td><td colspan="3">';
+			print '<tr class="visibleifcustomer"><td class="toptd">'.$form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
 			print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
 			print "</td></tr>";
@@ -1459,7 +1459,7 @@ 
 
 			// Supplier
 			//if ($object->fournisseur) {
-			print '<tr class="visibleifsupplier"><td class="toptd">' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . '</td><td colspan="3">';
+			print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
 			print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
 			print "</td></tr>";
@@ -1467,7 +1467,7 @@ 
 		}
 
 		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
@@ -1477,12 +1477,12 @@ 
 		}
 
         // Other attributes
-        $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        $parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         if (empty($reshook))
         {
-        	print $object->showOptionals($extrafields,'edit');
+        	print $object->showOptionals($extrafields, 'edit');
         }
 
 		// Assign a sale representative
@@ -1491,7 +1491,7 @@ 
 		print '<td colspan="3" class="maxwidthonsmartphone">';
 		$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
 		// Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record.
-		print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%");
+		print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0 ?GETPOST('commercial', 'array') : (empty($user->rights->societe->client->voir) ? array($user->id) : array())), null, null, null, null, "90%");
 		print '</td></tr>';
 
         // Ajout du logo
@@ -1508,7 +1508,7 @@ 
 
         print '<div class="center">';
         print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-        if (! empty($backtopage))
+        if (!empty($backtopage))
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
@@ -1516,7 +1516,7 @@ 
         else
         {
             print ' &nbsp; &nbsp; ';
-            print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+            print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
         }
         print '</div>'."\n";
 
@@ -1528,21 +1528,21 @@ 
 
         if ($socid)
         {
-        	$res=$object->fetch_optionals();
+        	$res = $object->fetch_optionals();
             //if ($res < 0) { dol_print_error($db); exit; }
 
 	        $head = societe_prepare_head($object);
 
             // Load object modCodeTiers
-            $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
             if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             {
-                $module = substr($module, 0, dol_strlen($module)-4);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeClient = new $module($db);
@@ -1551,15 +1551,15 @@ 
             {
                 $prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
             }
-            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+            $module = $conf->global->SOCIETE_CODECLIENT_ADDON;
             if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             {
-                $module = substr($module, 0, dol_strlen($module)-4);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeFournisseur = new $module($db);
@@ -1574,19 +1574,19 @@ 
             if (GETPOSTISSET('name'))
             {
                 // We overwrite with values if posted
-                $object->name					= GETPOST('name', 'alpha');
+                $object->name = GETPOST('name', 'alpha');
                 $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
-                $object->client					= GETPOST('client', 'int');
+                $object->client = GETPOST('client', 'int');
                 $object->code_client			= GETPOST('customer_code', 'alpha');
                 $object->fournisseur			= GETPOST('fournisseur', 'int');
-                $object->code_fournisseur		= GETPOST('supplier_code', 'alpha');
-                $object->address				= GETPOST('address', 'alpha');
-                $object->zip					= GETPOST('zipcode', 'alpha');
-                $object->town					= GETPOST('town', 'alpha');
-                $object->country_id				= GETPOST('country_id')?GETPOST('country_id', 'int'):$mysoc->country_id;
+                $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+                $object->address = GETPOST('address', 'alpha');
+                $object->zip = GETPOST('zipcode', 'alpha');
+                $object->town = GETPOST('town', 'alpha');
+                $object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
                 $object->state_id				= GETPOST('state_id', 'int');
                 $object->skype					= GETPOST('skype', 'alpha');
-                $object->twitter				= GETPOST('twitter', 'alpha');
+                $object->twitter = GETPOST('twitter', 'alpha');
                 $object->facebook				= GETPOST('facebook', 'alpha');
                 $object->phone					= GETPOST('phone', 'alpha');
                 $object->fax					= GETPOST('fax', 'alpha');
@@ -1599,15 +1599,15 @@ 
                 $object->idprof4				= GETPOST('idprof4', 'alpha');
                 $object->idprof5				= GETPOST('idprof5', 'alpha');
                 $object->idprof6				= GETPOST('idprof6', 'alpha');
-                $object->typent_id				= GETPOST('typent_id', 'int');
-                $object->effectif_id			= GETPOST('effectif_id', 'int');
+                $object->typent_id = GETPOST('typent_id', 'int');
+                $object->effectif_id = GETPOST('effectif_id', 'int');
                 $object->barcode				= GETPOST('barcode', 'alpha');
-                $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
-                $object->default_lang			= GETPOST('default_lang', 'alpha');
+                $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+                $object->default_lang = GETPOST('default_lang', 'alpha');
 
                 $object->tva_assuj				= GETPOST('assujtva_value', 'int');
                 $object->tva_intra				= GETPOST('tva_intra', 'alpha');
-                $object->status					= GETPOST('status', 'int');
+                $object->status = GETPOST('status', 'int');
 
                 // Webservices url/key
                 $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -1616,32 +1616,32 @@ 
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
 				{
-					$object->fk_incoterms			= GETPOST('incoterm_id', 'int');
-					$object->location_incoterms		= GETPOST('lcoation_incoterms', 'alpha');
+					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
 
                 //Local Taxes
                 $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
                 $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
 
-                $object->localtax1_value		=GETPOST('lt1');
-                $object->localtax2_value		=GETPOST('lt2');
+                $object->localtax1_value		= GETPOST('lt1');
+                $object->localtax2_value		= GETPOST('lt2');
 
                 // We set country_id, and country_code label of the chosen country
                 if ($object->country_id > 0)
                 {
-                	$tmparray=getCountry($object->country_id,'all');
-                    $object->country_code	= $tmparray['code'];
-                    $object->country		= $tmparray['label'];
+                	$tmparray = getCountry($object->country_id, 'all');
+                    $object->country_code = $tmparray['code'];
+                    $object->country = $tmparray['label'];
                 }
             }
 
-            if($object->localtax1_assuj==0){
-            	$sub=0;
-            }else{$sub=1;}
-            if($object->localtax2_assuj==0){
-            	$sub2=0;
-            }else{$sub2=1;}
+            if ($object->localtax1_assuj == 0) {
+            	$sub = 0;
+            } else {$sub = 1; }
+            if ($object->localtax2_assuj == 0) {
+            	$sub2 = 0;
+            } else {$sub2 = 1; }
 
             if ($conf->use_javascript_ajax)
             {
@@ -1686,7 +1686,7 @@ 
 				});
        			function init_customer_categ() {
 					console.log("is customer or prospect = "+jQuery("#customerprospect").val());
-					if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || '.(empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER)?'1':'0').'))
+					if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || '.(empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER) ? '1' : '0').'))
 					{
 						jQuery(".visibleifcustomer").hide();
 					}
@@ -1735,7 +1735,7 @@ 
             print '<table class="border" width="100%">';
 
             // Ref/ID
-			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
 			{
 		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
             	print $object->ref;
@@ -1751,7 +1751,7 @@ 
 	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
             // Prefix
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+            if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
             {
                 print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
                 // It does not change the prefix mode using the auto numbering prefix
@@ -1770,19 +1770,19 @@ 
             // Prospect/Customer
             print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 	        print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
-            print '<option value="0"'.($object->client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
+            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
+            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
+            print '<option value="0"'.($object->client == 0 ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
             print '</select></td>';
             print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 
             print '<table class="nobordernopadding"><tr><td>';
             if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
             {
-                $tmpcode=$object->code_client;
-                if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) $tmpcode=$object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+                $tmpcode = $object->code_client;
+                if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+                if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
                 print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
             }
             else if ($object->codeclient_modifiable())
@@ -1795,34 +1795,34 @@ 
                 print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
             }
             print '</td><td>';
-            $s=$modCodeClient->getToolTip($langs,$object,0);
-            print $form->textwithpicto('',$s,1);
+            $s = $modCodeClient->getToolTip($langs, $object, 0);
+            print $form->textwithpicto('', $s, 1);
             print '</td></tr></table>';
 
             print '</td></tr>';
 
             // Supplier
-            if ((! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
-            	|| (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
+            if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+            	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
             {
                 print '<tr>';
                 print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td class="maxwidthonsmartphone">';
-                print $form->selectyesno("fournisseur",$object->fournisseur,1);
+                print $form->selectyesno("fournisseur", $object->fournisseur, 1);
                 print '</td>';
                 print '<td>';
-                if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
+                if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
                 {
                 	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
                 }
                 print '</td><td>';
-                if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
+                if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
                 {
 	                print '<table class="nobordernopadding"><tr><td>';
 	                if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
 	                {
-	                    $tmpcode=$object->code_fournisseur;
-	                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-	                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+	                    $tmpcode = $object->code_fournisseur;
+	                    if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+	                    if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
 	                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
 	                }
 	                else if ($object->codefournisseur_modifiable())
@@ -1835,15 +1835,15 @@ 
 	                    print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
 	                }
 	                print '</td><td>';
-	                $s=$modCodeFournisseur->getToolTip($langs,$object,1);
-	                print $form->textwithpicto('',$s,1);
+	                $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+	                print $form->textwithpicto('', $s, 1);
 	                print '</td></tr></table>';
                 }
                 print '</td></tr>';
             }
 
             // Barcode
-            if (! empty($conf->barcode->enabled))
+            if (!empty($conf->barcode->enabled))
             {
                 print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
@@ -1852,7 +1852,7 @@ 
 
             // Status
             print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-            print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$object->status);
+            print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
             print '</td></tr>';
 
             // Address
@@ -1870,14 +1870,14 @@ 
 
             // Country
             print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
-            print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id), 'country_id');
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
 
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+                if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
@@ -1886,32 +1886,32 @@ 
                     print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
 
-                print $formcompany->select_state($object->state_id,$object->country_code);
+                print $formcompany->select_state($object->state_id, $object->country_code);
                 print '</td></tr>';
             }
 
             // EMail / Web
-            print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', (! empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+            print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
 	        print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
             print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
 	        print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
 
-	        if (! empty($conf->socialnetworks->enabled))
+	        if (!empty($conf->socialnetworks->enabled))
 	        {
 	        	// Skype
-	        	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
+	        	if (!empty($conf->global->SOCIALNETWORKS_SKYPE))
 	        	{
 	        		print '<tr><td>'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</td>';
 	        		print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
 	        	}
 	        	// Twitter
-	        	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
+	        	if (!empty($conf->global->SOCIALNETWORKS_TWITTER))
 	        	{
 	        		print '<tr><td>'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</td>';
 	        		print '<td colspan="3"><input type="text" name="twitter" id="twitter" value="'.$object->twitter.'"></td></tr>';
 	        	}
 	        	// Facebook
-	        	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+	        	if (!empty($conf->global->SOCIALNETWORKS_FACEBOOK))
 	        	{
 	        		print '<tr><td>'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</td>';
 	        		print '<td colspan="3"><input type="text" name="facebook" id="facebook" value="'.$object->facebook.'"></td></tr>';
@@ -1925,18 +1925,18 @@ 
 	        print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
 
             // Prof ids
-            $i=1; $j=0;
+            $i = 1; $j = 0;
             while ($i <= 6)
             {
-                $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-                if ($idprof!='-')
+                $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+                if ($idprof != '-')
                 {
-	                $key='idprof'.$i;
+	                $key = 'idprof'.$i;
 
 	                if (($j % 2) == 0) print '<tr>';
 
-	                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', ! (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())).'</td><td>';
+	                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
+	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
 	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                     print '</td>';
                     if (($j % 2) == 1) print '</tr>';
@@ -1948,53 +1948,53 @@ 
 
             // VAT is used
             print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-            print $form->selectyesno('assujtva_value',$object->tva_assuj,1);
+            print $form->selectyesno('assujtva_value', $object->tva_assuj, 1);
             print '</td></tr>';
 
             // Local Taxes
             //TODO: Place into a function to control showing by country or study better option
-            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+            if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
             {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
-                print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                if(! isOnlyOneLocalTax(1))
+                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
+                print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
+                if (!isOnlyOneLocalTax(1))
                 {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+                    print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+                    $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
                     print '</span>';
                 }
                 print '</td>';
 
-                print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
-                print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
-                if  (! isOnlyOneLocalTax(2))
+                print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
+                print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
+                if (!isOnlyOneLocalTax(2))
                 {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+                    print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+                    $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
                     print '</span>';
                 }
                 print '</td></tr>';
             }
-            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+            elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
             {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
-                print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                if(! isOnlyOneLocalTax(1))
+                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
+                print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
+                if (!isOnlyOneLocalTax(1))
                 {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+                    print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+                    $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
                     print '</span>';
                 }
                 print '</td></tr>';
             }
-            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+            elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
             {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
-                print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
-                if(! isOnlyOneLocalTax(2))
+                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
+                print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
+                if (!isOnlyOneLocalTax(2))
                 {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+                    print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+                    $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
                     print '</span>';
                 }
                 print '</td></tr>';
@@ -2003,11 +2003,11 @@ 
             // VAT Code
             print '<tr><td>'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
             print '<td colspan="3">';
-            $s ='<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+            $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
             if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
             {
-                $s.=' &nbsp; ';
+                $s .= ' &nbsp; ';
 
                 if ($conf->use_javascript_ajax)
                 {
@@ -2018,12 +2018,12 @@ 
                     print "}\n";
                     print '</script>';
                     print "\n";
-                    $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                    $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                    $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
                 }
                 else
                 {
-                    $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
@@ -2032,12 +2032,12 @@ 
 
             // Type - Size
             print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td>';
             print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
 
             // Juridical type
@@ -2052,10 +2052,10 @@ 
 	        print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
 
             // Default language
-            if (! empty($conf->global->MAIN_MULTILANGS))
+            if (!empty($conf->global->MAIN_MULTILANGS))
             {
                 print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
-                print $formadmin->select_language($object->default_lang,'default_lang',0,0,1);
+                print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
                 print '</td>';
                 print '</tr>';
             }
@@ -2066,20 +2066,20 @@ 
             	print '<tr>';
       				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
             	print '<td colspan="3" class="maxwidthonsmartphone">';
-            	print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+            	print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
             	print '</td></tr>';
             }
 
 			// Categories
-			if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 			{
 				// Customer
-				print '<tr class="visibleifcustomer"><td>' . $form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0) . '</td>';
+				print '<tr class="visibleifcustomer"><td>'.$form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
 				$c = new Categorie($db);
 				$cats = $c->containing($object->id, Categorie::TYPE_CUSTOMER);
-				$arrayselected=array();
+				$arrayselected = array();
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
@@ -2087,12 +2087,12 @@ 
 				print "</td></tr>";
 
 				// Supplier
-				print '<tr class="visibleifsupplier"><td>' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . '</td>';
+				print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
 				$c = new Categorie($db);
 				$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
-				$arrayselected=array();
+				$arrayselected = array();
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
@@ -2101,7 +2101,7 @@ 
 			}
 
 			// Multicurrency
-			if (! empty($conf->multicurrency->enabled))
+			if (!empty($conf->multicurrency->enabled))
 			{
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
@@ -2111,12 +2111,12 @@ 
 			}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            $parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-            	print $object->showOptionals($extrafields,'edit');
+            	print $object->showOptionals($extrafields, 'edit');
             }
 
             // Webservices url/key
@@ -2131,8 +2131,8 @@ 
             print '<tr class="hideonsmartphone">';
             print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
             print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe',$object);
-            $caneditfield=1;
+            if ($object->logo) print $form->showphoto('societe', $object);
+            $caneditfield = 1;
             if ($caneditfield)
             {
                 if ($object->logo) print "<br>\n";
@@ -2175,7 +2175,7 @@ 
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals();
+        if (!empty($object->id)) $res = $object->fetch_optionals();
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -2203,11 +2203,11 @@ 
 		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
 	    }
 
-        dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+        dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
 
         print '<div class="fichecenter">';
@@ -2222,7 +2222,7 @@ 
     	print '</td></tr>';
 
     	// Supplier
-   		if (! empty($conf->fournisseur->enabled) || ! empty($conf->supplier_proposal->enabled))
+   		if (!empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
     	{
     		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
     		print yn($object->fournisseur);
@@ -2230,10 +2230,10 @@ 
     	}
 
     	// Prefix
-        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
         {
             print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
-            print $htmllogobar; $htmllogobar='';
+            print $htmllogobar; $htmllogobar = '';
             print '</tr>';
         }
 
@@ -2245,49 +2245,49 @@ 
             print $object->code_client;
             if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
             print '</td>';
-            print $htmllogobar; $htmllogobar='';
+            print $htmllogobar; $htmllogobar = '';
             print '</tr>';
         }
 
         // Supplier code
-        if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+        if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
         {
             print '<tr><td>';
             print $langs->trans('SupplierCode').'</td><td>';
             print $object->code_fournisseur;
             if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
             print '</td>';
-            print $htmllogobar; $htmllogobar='';
+            print $htmllogobar; $htmllogobar = '';
             print '</tr>';
         }
 
         // Barcode
-        if (! empty($conf->barcode->enabled))
+        if (!empty($conf->barcode->enabled))
         {
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td>'.$object->barcode;
             print '</td>';
-			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
+			if ($htmllogobar) $htmllogobar .= $form->showbarcode($object);
             print $htmllogobar;
-			$htmllogobar='';
+			$htmllogobar = '';
             print '</tr>';
         }
 
         // Prof ids
-        $i=1; $j=0;
+        $i = 1; $j = 0;
         while ($i <= 6)
         {
-            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-            if ($idprof!='-')
+            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+            if ($idprof != '-')
             {
                 //if (($j % 2) == 0) print '<tr>';
                 print '<tr>';
             	print '<td>'.$idprof.'</td><td>';
-                $key='idprof'.$i;
+                $key = 'idprof'.$i;
                 print $object->$key;
                 if ($object->$key)
                 {
-                    if ($object->id_prof_check($i,$object) > 0) print ' &nbsp; '.$object->id_prof_url($i,$object);
+                    if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
                     else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
                 }
                 print '</td>';
@@ -2308,7 +2308,7 @@ 
         {
 	        // VAT is used
 	        print '<tr><td>';
-	        print $form->textwithpicto($langs->trans('VATIsUsed'),$langs->trans('VATIsUsedWhenSelling'));
+	        print $form->textwithpicto($langs->trans('VATIsUsed'), $langs->trans('VATIsUsedWhenSelling'));
 	        print '</td><td>';
 	        print yn($object->tva_assuj);
 	        print '</td>';
@@ -2316,26 +2316,26 @@ 
         }
 
 		// Local Taxes
-        if ($object->fournisseur || $mysoc->country_code=='ES')
+        if ($object->fournisseur || $mysoc->country_code == 'ES')
         {
-        	if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+        	if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax1_assuj);
-			    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+			    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax2_assuj);
 			    print '</td></tr>';
 
-			    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+			    if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
 			    {
 			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 			        print '<input type="hidden" name="action" value="set_localtax1">';
 			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editRE')
+			        print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+			        if ($action == 'editRE')
 			        {
 			            print '<td align="left">';
-			            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			        }
 			        else
@@ -2344,60 +2344,60 @@ 
 			        }
 			        print '</tr></form>';
 			    }
-			    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+			    if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
 			    {
 			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 			        print '<input type="hidden" name="action" value="set_localtax2">';
 			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editIRPF'){
+			        print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+			        if ($action == 'editIRPF') {
 			            print '<td align="left">';
-			            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+			            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
+			        } else {
 			            print '<td>'.$object->localtax2_value.'</td>';
 			        }
 			        print '</tr></form>';
 			    }
 			}
-			elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+			elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax1_assuj);
 			    print '</td></tr>';
-			    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+			    if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
 			    {
 			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 			        print '<input type="hidden" name="action" value="set_localtax1">';
 			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editRE'){
+			        print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+			        if ($action == 'editRE') {
 			            print '<td align="left">';
-			            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
+			        } else {
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
 			        print '</tr></form>';
 			    }
 			}
-			elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+			elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax2_assuj);
 			    print '</td></tr>';
-			    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+			    if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
 			    {
 
 			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 			        print '<input type="hidden" name="action" value="set_localtax2">';
 			        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			        print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-			        if($action == 'editIRPF'){
+			        print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+			        if ($action == 'editIRPF') {
 			            print '<td align="left">';
-			            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+			            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
+			        } else {
 			            print '<td>'.$object->localtax2_value.'</td>';
 			        }
 			        print '</tr></form>';
@@ -2410,13 +2410,13 @@ 
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
         if ($object->tva_intra)
         {
-            $s='';
-            $s.=$object->tva_intra;
-            $s.='<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
+            $s = '';
+            $s .= $object->tva_intra;
+            $s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
 
             if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
             {
-                $s.=' &nbsp; ';
+                $s .= ' &nbsp; ';
 
                 if ($conf->use_javascript_ajax)
                 {
@@ -2427,12 +2427,12 @@ 
                     print "}\n";
                     print '</script>';
                     print "\n";
-                    $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                    $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
+                    $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
                 }
                 else
                 {
-                    $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
@@ -2446,7 +2446,7 @@ 
 
         // Type + Staff
         $arr = $formcompany->typent_array(1);
-        $object->typent= $arr[$object->typent_code];
+        $object->typent = $arr[$object->typent_code];
         print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
         print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
 
@@ -2459,11 +2459,11 @@ 
         print '<table class="border tableforfield" width="100%">';
 
     	// Tags / categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 		{
 			// Customer
-			if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
-				print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
+			if ($object->prospect || $object->client || (!$object->fournisseur && !empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
+				print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
 				print '<td>';
 				print $form->showCategories($object->id, 'customer', 1);
 				print "</td></tr>";
@@ -2471,7 +2471,7 @@ 
 
 			// Supplier
 			if ($object->fournisseur) {
-				print '<tr><td>' . $langs->trans("SuppliersCategoriesShort") . '</td>';
+				print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 				print '<td>';
 				print $form->showCategories($object->id, 'supplier', 1);
 				print "</td></tr>";
@@ -2483,19 +2483,19 @@ 
 
         // Capital
         print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
+        if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
         else print '&nbsp;';
         print '</td></tr>';
 
         // Default language
-        if (! empty($conf->global->MAIN_MULTILANGS))
+        if (!empty($conf->global->MAIN_MULTILANGS))
         {
             require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
             print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
             //$s=picto_from_langcode($object->default_lang);
             //print ($s?$s.' ':'');
             $langs->load("languages");
-            $labellang = ($object->default_lang?$langs->trans('Language_'.$object->default_lang):'');
+            $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
             print $labellang;
             print '</td></tr>';
         }
@@ -2507,7 +2507,7 @@ 
         	print '<table width="100%" class="nobordernopadding"><tr><td>';
         	print $langs->trans('IncotermLabel');
         	print '<td><td align="right">';
-        	if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
+        	if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
         	else print '&nbsp;';
         	print '</td></tr></table>';
         	print '</td>';
@@ -2518,24 +2518,24 @@ 
         	}
         	else
         	{
-        		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
+        		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
         	}
         	print '</td></tr>';
         }
 
 		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
+	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
 			print '</td></tr>';
 		}
 
 		// Other attributes
-		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
         // Parent company
         if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
@@ -2545,16 +2545,16 @@ 
         	print '<table class="nobordernopadding" width="100%"><tr><td>';
         	print $langs->trans('ParentCompany');
         	print '</td>';
-        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
         	print '</tr></table>';
         	print '</td><td colspan="3">';
         	if ($action == 'editparentcompany')
         	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
+        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
         	}
         	else
         	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
+        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
         	}
         	print '</td>';
         	print '</tr>';
@@ -2564,16 +2564,16 @@ 
         include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
         // Module Adherent
-        if (! empty($conf->adherent->enabled))
+        if (!empty($conf->adherent->enabled))
         {
             $langs->load("members");
             print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
             print '<td colspan="3">';
-            $adh=new Adherent($db);
-            $result=$adh->fetch('','',$object->id);
+            $adh = new Adherent($db);
+            $result = $adh->fetch('', '', $object->id);
             if ($result > 0)
             {
-                $adh->ref=$adh->getFullName($langs);
+                $adh->ref = $adh->getFullName($langs);
                 print $adh->getNomUrl(1);
             }
             else
@@ -2606,8 +2606,8 @@ 
         {
 	        print '<div class="tabsAction">'."\n";
 
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if (empty($reshook))
 			{
 				$at_least_one_email_contact = false;
@@ -2621,7 +2621,7 @@ 
 					}
 				}
 
-		        if (! empty($object->email) || $at_least_one_email_contact)
+		        if (!empty($object->email) || $at_least_one_email_contact)
 		        {
 		        	$langs->load("mails");
 		        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
@@ -2674,10 +2674,10 @@ 
 	            /*
 	             * Documents generes
 	             */
-	            $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
-	            $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-	            $genallowed=$user->rights->societe->lire;
-	            $delallowed=$user->rights->societe->creer;
+	            $filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
+	            $urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
+	            $genallowed = $user->rights->societe->lire;
+	            $delallowed = $user->rights->societe->creer;
 
 	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
 	        }
@@ -2685,7 +2685,7 @@ 
 			// Subsidiaries list
 			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
 			{
-				$result=show_subsidiaries($conf,$langs,$db,$object);
+				$result = show_subsidiaries($conf, $langs, $db, $object);
 			}
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
@@ -2693,35 +2693,35 @@ 
 			$MAXEVENT = 10;
 
 			$morehtmlright = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id.'">';
-			$morehtmlright.= $langs->trans("SeeAll");
-			$morehtmlright.= '</a>';
+			$morehtmlright .= $langs->trans("SeeAll");
+			$morehtmlright .= '</a>';
 
 			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright);		// Show all action for thirdparty
+			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
 
 			print '</div></div></div>';
 
-			if (! empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
+			if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
 			{
 				// Contacts list
 				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 				{
-					$result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+					$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 
 				// Addresses list
-				if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+				if (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
 				{
-					$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+					$result = show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 			}
 		}
 
 		// Presend form
-		$modelmail='thirdparty';
-		$defaulttopic='Information';
+		$modelmail = 'thirdparty';
+		$defaulttopic = 'Information';
 		$diroutput = $conf->societe->dir_output;
 		$trackid = 'thi'.$object->id;
 

Braces +291 added lines, -181 removed lines

@@ -45,12 +45,20 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (! empty($conf->adherent->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
 
 $langs->loadLangs(array("companies","commercial","bills","banks","users"));
-if (! empty($conf->categorie->enabled)) $langs->load("categories");
-if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
+if (! empty($conf->categorie->enabled)) {
+    $langs->load("categories");
+}
+if (! empty($conf->incoterm->enabled)) {
+    $langs->load("incoterm");
+}
+if (! empty($conf->notification->enabled)) {
+    $langs->load("mails");
+}
 
 $mesg=''; $error=0; $errors=array();
 
@@ -60,8 +68,12 @@ 
 $confirm	= GETPOST('confirm','alpha');
 
 $socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if (empty($socid) && $action == 'view') $action='create';
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
+if (empty($socid) && $action == 'view') {
+    $action='create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -72,7 +84,9 @@ 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycard','globalcard'));
 
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+    $object->fetch($socid);
+}
 
 if (! ($object->id > 0) && $action == 'view')
 {
@@ -102,7 +116,9 @@ 
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -127,8 +143,7 @@ 
 			$langs->load('errors');
 			$langs->load('companies');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
-		}
-		else
+		} else
 		{
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
@@ -155,7 +170,9 @@ 
 				);
 				foreach ($listofproperties as $property)
 				{
-					if (empty($object->$property)) $object->$property = $soc_origin->$property;
+					if (empty($object->$property)) {
+					    $object->$property = $soc_origin->$property;
+					}
 				}
 
 				// Concat some data
@@ -172,7 +189,9 @@ 
 				{
 					foreach ($soc_origin->array_options as $key => $val)
 					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+					    if (empty($object->array_options[$key])) {
+					        $object->array_options[$key] = $val;
+					    }
 					}
 				}
 
@@ -291,8 +310,7 @@ 
 				{
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
-				}
-				else
+				} else
 				{
 				    $langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
@@ -337,7 +355,9 @@ 
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-        if ($ret < 0) $error++;
+        if ($ret < 0) {
+            $error++;
+        }
 
         if (! $error)
         {
@@ -349,7 +369,9 @@ 
         	}
         }
 
-        if ($error) $action = 'edit_extras';
+        if ($error) {
+            $action = 'edit_extras';
+        }
     }
 
     // Add new or update third party
@@ -380,20 +402,22 @@ 
 	        {
 	        	$ret=$object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas=$canvas;
+	        } else {
+			    $object->canvas=$canvas;
+			}
 
-	        if (GETPOST("private") == 1)	// Ask to create a contact
+	        if (GETPOST("private") == 1) {
+	            // Ask to create a contact
 	        {
 	            $object->particulier		= GETPOST("private");
+	        }
 
 	            $object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
 	            $object->civility_id		= GETPOST('civility_id');	// Note: civility id is a code, not an int
 	            // Add non official properties
 	            $object->name_bis			= GETPOST('name','alpha');
 	            $object->firstname			= GETPOST('firstname','alpha');
-	        }
-	        else
+	        } else
 	        {
 	            $object->name				= GETPOST('name', 'alpha');
 	        }
@@ -470,8 +494,11 @@ 
 				 $error++;
 			}
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        if (GETPOST('deletephoto')) {
+	            $object->logo = '';
+	        } else if (! empty($_FILES['photo']['name'])) {
+	            $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        }
 
 	        // Check parameters
 	        if (! GETPOST('cancel','alpha'))
@@ -518,8 +545,12 @@ 
 
                 $db->begin();
 
-                if (empty($object->client))      $object->code_client='';
-                if (empty($object->fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client)) {
+                    $object->code_client='';
+                }
+                if (empty($object->fournisseur)) {
+                    $object->code_fournisseur='';
+                }
 
                 $result = $object->create($user);
 
@@ -580,16 +611,14 @@ 
                                 if (! $result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else
+                                } else
                                 {
                                     // Create thumbs
                                     $object->addThumbs($newfile);
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
 					{
 						switch($_FILES['photo']['error'])
 						{
@@ -603,12 +632,13 @@ 
 						}
 	                }
                     // Gestion du logo de la société
-                }
-                else
+                } else
 				{
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				        // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
+				    }
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
@@ -623,21 +653,24 @@ 
 
                 	if (! empty($backtopage))
                 	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+                	    if (preg_match('/\?/', $backtopage)) {
+                	        $backtopage.='&socid='.$object->id;
+                	    }
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                     	$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+                    	    $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+                    	} else if ($object->fournisseur == 1) {
+                    	    $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+                    	}
 
                 		header("Location: ".$url);
                     	exit;
                 	}
-                }
-                else
+                } else
                 {
                     $db->rollback();
                     $action='create';
@@ -654,8 +687,7 @@ 
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
@@ -663,8 +695,12 @@ 
                 }
 
                 // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client='';
-                if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client) && empty($object->oldcopy->code_client)) {
+                    $object->code_client='';
+                }
+                if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) {
+                    $object->code_fournisseur='';
+                }
                 //var_dump($object);exit;
 
                 $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
@@ -729,8 +765,7 @@ 
                             if (! $result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else
+                            } else
                             {
                             	// Create thumbs
                             	$object->addThumbs($newfile);
@@ -746,13 +781,11 @@ 
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
 					{
                         $errors[] = "ErrorBadImageFormat";
                     }
-                }
-                else
+                } else
                 {
 					switch($_FILES['photo']['error'])
 					{
@@ -788,21 +821,18 @@ 
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
-                }
-                else
+                } else
                 {
                     $object->id = $socid;
                     $action= "edit";
                 }
             }
-        }
-        else
+        } else
         {
         	$action = ($action=='add'?'create':'edit');
         }
@@ -818,8 +848,7 @@ 
         {
             header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
             exit;
-        }
-        else
+        } else
         {
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
@@ -872,11 +901,15 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
-}
+	if ($result <= 0) {
+	    dol_print_error('',$object->error);
+	}
+	}
 
 $title=$langs->trans("ThirdParty");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name." - ".$langs->trans('Card');
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -889,8 +922,7 @@ 
     // -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
     $objcanvas->display_canvas($action);							// Show template
-}
-else
+} else
 {
     // -----------------------------------------
     // When used in standard mode
@@ -901,8 +933,12 @@ 
          *  Creation
          */
 		$private=GETPOST("private","int");
-		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
-    	if (empty($private)) $private=0;
+		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) {
+		    $private=1;
+		}
+    	if (empty($private)) {
+    	    $private=0;
+    	}
 
         // Load object modCodeTiers
         $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -914,7 +950,9 @@ 
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
+            if ($res) {
+                break;
+            }
         }
         $modCodeClient = new $module;
         // Load object modCodeFournisseur
@@ -927,7 +965,9 @@ 
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
+            if ($res) {
+                break;
+            }
         }
         $modCodeFournisseur = new $module;
 
@@ -950,8 +990,7 @@ 
         if(empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('customer_code', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
-        }
-		else {
+        } else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
 
@@ -1013,8 +1052,7 @@ 
                     if (! $result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else
+                    } else
                     {
                         // Create thumbs
                         $object->addThumbs($newfile);
@@ -1135,7 +1173,9 @@ 
         print '<input type="hidden" name="type" value='.GETPOST("type",'alpha').'>';
         print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
         print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
-        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+            print '<input type="hidden" name="code_auto" value="1">';
+        }
 
         dol_fiche_head(null, 'card', '', 0, '');
 
@@ -1146,17 +1186,18 @@ 
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
-        }
-        else
+        } else
 		{
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
 	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
-	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+	        // Old not used prefix field
 	    {
 		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
 	    }
+	    }
 	    print '</tr>';
 
         // If javascript on, we show option individual
@@ -1180,17 +1221,27 @@ 
 	    print '<td class="maxwidthonsmartphone">';
 	    $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
         print '<select class="flat" name="client" id="customerprospect">';
-        if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+        if (GETPOST("type") == '') {
+            print '<option value="-1">&nbsp;</option>';
+        }
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+            print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+        }
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+            print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+        }
+        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+            print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+        }
         print '<option value="0"'.((string) $selected == '0'?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
         print '</select></td>';
 
         print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
         print '<table class="nobordernopadding"><tr><td>';
 		$tmpcode=$object->code_client;
-        if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+        if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) {
+            $tmpcode=$modCodeClient->getNextValue($object,0);
+        }
         print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
         print '</td><td>';
         $s=$modCodeClient->getToolTip($langs,$object,0);
@@ -1205,7 +1256,9 @@ 
             print '<tr>';
             print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
             $default = -1;
-            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
+            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) {
+                $default=1;
+            }
             print $form->selectyesno("fournisseur", (GETPOST('fournisseur','int')!=''?GETPOST('fournisseur','int'):(GETPOST("type",'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type",'alpha') == '' ? 1 : 0));
             print '</td>';
             print '<td>';
@@ -1218,7 +1271,9 @@ 
             {
 	            print '<table class="nobordernopadding"><tr><td>';
 	            $tmpcode=$object->code_fournisseur;
-	            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+	            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) {
+	                $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+	            }
 	            print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
 	            print '</td><td>';
 	            $s=$modCodeFournisseur->getToolTip($langs,$object,1);
@@ -1257,7 +1312,9 @@ 
         // Country
         print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
         print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td></tr>';
 
         // State
@@ -1266,14 +1323,16 @@ 
             if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
             {
                 print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
-            else
+            } else
             {
                 print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
-            if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
-            else print $countrynotdefined;
+            if ($object->country_id) {
+                print $formcompany->select_state($object->state_id,$object->country_code);
+            } else {
+                print $countrynotdefined;
+            }
             print '</td></tr>';
         }
 
@@ -1326,19 +1385,25 @@ 
             {
 	            $key='idprof'.$i;
 
-                if (($j % 2) == 0) print '<tr>';
+                if (($j % 2) == 0) {
+                    print '<tr>';
+                }
 
                 $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
                 print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory)?0:1)).'</td><td>';
 
                 print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                 print '</td>';
-                if (($j % 2) == 1) print '</tr>';
+                if (($j % 2) == 1) {
+                    print '</tr>';
+                }
                 $j++;
             }
             $i++;
         }
-        if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+        if ($j % 2 == 1) {
+            print '<td colspan="2"></td></tr>';
+        }
 
         // Vat is used
         print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
@@ -1364,8 +1429,7 @@ 
                 print "\n";
                 $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                 $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-            }
-            else
+            } else
             {
                 $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
             }
@@ -1383,14 +1447,12 @@ 
             print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
-        }
-        elseif($mysoc->localtax1_assuj=="1")
+        } elseif($mysoc->localtax1_assuj=="1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
             print '</td></tr>';
-        }
-        elseif($mysoc->localtax2_assuj=="1")
+        } elseif($mysoc->localtax2_assuj=="1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
@@ -1401,11 +1463,15 @@ 
         print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">'."\n";
         $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+            print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td>';
         print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+            print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td></tr>';
 
         // Legal Form
@@ -1414,8 +1480,7 @@ 
         if ($object->country_id)
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else
+        } else
         {
             print $countrynotdefined;
         }
@@ -1512,8 +1577,7 @@ 
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else
+        } else
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
@@ -1521,8 +1585,7 @@ 
         print '</div>'."\n";
 
         print '</form>'."\n";
-    }
-    elseif ($action == 'edit')
+    } elseif ($action == 'edit')
     {
         //print load_fiche_titre($langs->trans("EditCompany"));
 
@@ -1543,7 +1606,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                    break;
+                }
             }
             $modCodeClient = new $module($db);
             // We verified if the tag prefix is used
@@ -1560,7 +1625,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                    break;
+                }
             }
             $modCodeFournisseur = new $module($db);
             // On verifie si la balise prefix est utilisee
@@ -1638,10 +1705,10 @@ 
 
             if($object->localtax1_assuj==0){
             	$sub=0;
-            }else{$sub=1;}
+            } else{$sub=1;}
             if($object->localtax2_assuj==0){
             	$sub2=0;
-            }else{$sub2=1;}
+            } else{$sub2=1;}
 
             if ($conf->use_javascript_ajax)
             {
@@ -1726,7 +1793,9 @@ 
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="socid" value="'.$object->id.'">';
             print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+                print '<input type="hidden" name="code_auto" value="1">';
+            }
 
 
             dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
@@ -1751,16 +1820,17 @@ 
 	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
             // Prefix
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+            if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+                // Old not used prefix field
             {
                 print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
+            }
                 // It does not change the prefix mode using the auto numbering prefix
                 if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
                 {
                     print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
-                }
-                else
+                } else
                 {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
@@ -1770,9 +1840,15 @@ 
             // Prospect/Customer
             print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 	        print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+                print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+            }
+            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+                print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+            }
+            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+                print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+            }
             print '<option value="0"'.($object->client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
             print '</select></td>';
             print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
@@ -1781,15 +1857,18 @@ 
             if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
             {
                 $tmpcode=$object->code_client;
-                if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) $tmpcode=$object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+                if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) {
+                    $tmpcode=$object->oldcopy->code_client;
+                }
+                // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+                if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) {
+                    $tmpcode=$modCodeClient->getNextValue($object,0);
+                }
                 print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            }
-            else if ($object->codeclient_modifiable())
+            } else if ($object->codeclient_modifiable())
             {
             	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
-            }
-            else
+            } else
             {
                 print $object->code_client;
                 print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
@@ -1821,15 +1900,18 @@ 
 	                if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
 	                {
 	                    $tmpcode=$object->code_fournisseur;
-	                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-	                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+	                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) {
+	                        $tmpcode=$object->oldcopy->code_fournisseur;
+	                    }
+	                    // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+	                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) {
+	                        $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+	                    }
 	                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-	                }
-	                else if ($object->codefournisseur_modifiable())
+	                } else if ($object->codefournisseur_modifiable())
 	                {
 	                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-	                }
-	                else
+	                } else
 	              {
 	                    print $object->code_fournisseur;
 	                    print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
@@ -1871,7 +1953,9 @@ 
             // Country
             print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
             print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td></tr>';
 
             // State
@@ -1880,8 +1964,7 @@ 
                 if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
-                else
+                } else
                 {
                     print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
@@ -1933,18 +2016,24 @@ 
                 {
 	                $key='idprof'.$i;
 
-	                if (($j % 2) == 0) print '<tr>';
+	                if (($j % 2) == 0) {
+	                    print '<tr>';
+	                }
 
 	                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
 	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', ! (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())).'</td><td>';
 	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                     print '</td>';
-                    if (($j % 2) == 1) print '</tr>';
+                    if (($j % 2) == 1) {
+                        print '</tr>';
+                    }
                     $j++;
                 }
                 $i++;
             }
-            if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+            if ($j % 2 == 1) {
+                print '<td colspan="2"></td></tr>';
+            }
 
             // VAT is used
             print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
@@ -1974,8 +2063,7 @@ 
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+            } elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
             {
                 print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
@@ -1986,8 +2074,7 @@ 
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+            } elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
             {
                 print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
@@ -2020,8 +2107,7 @@ 
                     print "\n";
                     $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-                }
-                else
+                } else
                 {
                     $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
                 }
@@ -2033,11 +2119,15 @@ 
             // Type - Size
             print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td>';
             print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td></tr>';
 
             // Juridical type
@@ -2131,13 +2221,19 @@ 
             print '<tr class="hideonsmartphone">';
             print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
             print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe',$object);
+            if ($object->logo) {
+                print $form->showphoto('societe',$object);
+            }
             $caneditfield=1;
             if ($caneditfield)
             {
-                if ($object->logo) print "<br>\n";
+                if ($object->logo) {
+                    print "<br>\n";
+                }
                 print '<table class="nobordernopadding">';
-                if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                if ($object->logo) {
+                    print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                }
                 //print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
                 print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
                 print '</table>';
@@ -2151,7 +2247,9 @@ 
             print '<td colspan="3" class="maxwidthonsmartphone">';
             $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
             $arrayselected = GETPOST('commercial', 'array');
-            if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
+            if (empty($arrayselected)) {
+                $arrayselected = $object->getSalesRepresentatives($user, 1);
+            }
             print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
             print '</td></tr>';
 
@@ -2168,14 +2266,15 @@ 
 
             print '</form>';
         }
-    }
-    else
+    } else
     {
     	/*
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals();
+        if (!empty($object->id)) {
+            $res=$object->fetch_optionals();
+        }
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -2230,9 +2329,11 @@ 
     	}
 
     	// Prefix
-        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+            // Old not used prefix field
         {
             print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
+        }
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
         }
@@ -2243,7 +2344,9 @@ 
             print '<tr><td>';
             print $langs->trans('CustomerCode').'</td><td>';
             print $object->code_client;
-            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            if ($object->check_codeclient() <> 0) {
+                print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            }
             print '</td>';
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
@@ -2255,7 +2358,9 @@ 
             print '<tr><td>';
             print $langs->trans('SupplierCode').'</td><td>';
             print $object->code_fournisseur;
-            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            if ($object->check_codefournisseur() <> 0) {
+                print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            }
             print '</td>';
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
@@ -2267,7 +2372,9 @@ 
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td>'.$object->barcode;
             print '</td>';
-			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
+			if ($htmllogobar) {
+			    $htmllogobar.=$form->showbarcode($object);
+			}
             print $htmllogobar;
 			$htmllogobar='';
             print '</tr>';
@@ -2287,8 +2394,11 @@ 
                 print $object->$key;
                 if ($object->$key)
                 {
-                    if ($object->id_prof_check($i,$object) > 0) print ' &nbsp; '.$object->id_prof_url($i,$object);
-                    else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+                    if ($object->id_prof_check($i,$object) > 0) {
+                        print ' &nbsp; '.$object->id_prof_url($i,$object);
+                    } else {
+                        print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+                    }
                 }
                 print '</td>';
                 //if (($j % 2) == 1) print '</tr>';
@@ -2337,8 +2447,7 @@ 
 			            print '<td align="left">';
 			            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }
-			        else
+			        } else
 			        {
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
@@ -2354,13 +2463,12 @@ 
 			            print '<td align="left">';
 			            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
+			        } else{
 			            print '<td>'.$object->localtax2_value.'</td>';
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+			} elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
 			{
 			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
 			    print yn($object->localtax1_assuj);
@@ -2375,13 +2483,12 @@ 
 			            print '<td align="left">';
 			            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
+			        } else{
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+			} elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
 			{
 			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
 			    print yn($object->localtax2_assuj);
@@ -2397,7 +2504,7 @@ 
 			            print '<td align="left">';
 			            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }else{
+			        } else{
 			            print '<td>'.$object->localtax2_value.'</td>';
 			        }
 			        print '</tr></form>';
@@ -2429,15 +2536,13 @@ 
                     print "\n";
                     $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-                }
-                else
+                } else
                 {
                     $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
                 }
             }
             print $s;
-        }
-        else
+        } else
         {
             print '&nbsp;';
         }
@@ -2483,8 +2588,11 @@ 
 
         // Capital
         print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
-        else print '&nbsp;';
+        if ($object->capital) {
+            print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
+        } else {
+            print '&nbsp;';
+        }
         print '</td></tr>';
 
         // Default language
@@ -2507,16 +2615,18 @@ 
         	print '<table width="100%" class="nobordernopadding"><tr><td>';
         	print $langs->trans('IncotermLabel');
         	print '<td><td align="right">';
-        	if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
-        	else print '&nbsp;';
+        	if ($user->rights->societe->creer) {
+        	    print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
+        	} else {
+        	    print '&nbsp;';
+        	}
         	print '</td></tr></table>';
         	print '</td>';
         	print '<td colspan="3">';
         	if ($action != 'editincoterm')
         	{
         		print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-        	}
-        	else
+        	} else
         	{
         		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
         	}
@@ -2545,14 +2655,15 @@ 
         	print '<table class="nobordernopadding" width="100%"><tr><td>';
         	print $langs->trans('ParentCompany');
         	print '</td>';
-        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+        	if ($action != 'editparentcompany') {
+        	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+        	}
         	print '</tr></table>';
         	print '</td><td colspan="3">';
         	if ($action == 'editparentcompany')
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
-        	}
-        	else
+        	} else
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
         	}
@@ -2575,8 +2686,7 @@ 
             {
                 $adh->ref=$adh->getFullName($langs);
                 print $adh->getNomUrl(1);
-            }
-            else
+            } else
             {
                 print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
@@ -2625,8 +2735,7 @@ 
 		        {
 		        	$langs->load("mails");
 		        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-		        }
-		        else
+		        } else
 				{
 		        	$langs->load("mails");
 		       		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
@@ -2644,11 +2753,12 @@ 
 
 		        if ($user->rights->societe->supprimer)
 		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {
+		                // We can't use preloaded confirm form with jmobile
 		            {
 		                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
 		            }
-		            else
+		            } else
 					{
 		                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
 		            }

dolibarr/htdocs/societe/ajaxcompanies.php

Spacing +31 added lines, -31 removed lines

@@ -23,12 +23,12 @@ 
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
 require '../main.inc.php';
 
@@ -46,67 +46,67 @@ 
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-dol_syslog(join(',',$_GET));
+dol_syslog(join(',', $_GET));
 
 
 // Generation liste des societes
-if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
+if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 {
 	$return_arr = array();
 
 	// Define filter on text typed
-	$socid = $_GET['newcompany']?$_GET['newcompany']:'';
-	if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
-	if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+	$socid = $_GET['newcompany'] ? $_GET['newcompany'] : '';
+	if (!$socid) $socid = $_GET['socid'] ? $_GET['socid'] : '';
+	if (!$socid) $socid = $_GET['id_fourn'] ? $_GET['id_fourn'] : '';
 
 	$sql = "SELECT rowid, nom";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= " WHERE s.entity IN (".getEntity('societe').")";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid)
 	{
-        $sql.=" AND (";
+        $sql .= " AND (";
         // Add criteria on name/code
-        if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+        if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
         {
-            $sql.="nom LIKE '" . $db->escape($socid) . "%'";
-            $sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'";
-            $sql.=" OR code_fournisseur LIKE '" . $db->escape($socid) . "%'";
+            $sql .= "nom LIKE '".$db->escape($socid)."%'";
+            $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
+            $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
         }
         else
         {
-    		$sql.="nom LIKE '%" . $db->escape($socid) . "%'";
-    		$sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
-    		$sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
+    		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
+    		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
+    		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
         }
-		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
-		$sql.=")";
+		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR rowid = '".$db->escape($socid)."'";
+		$sql .= ")";
 	}
-	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
-	$sql.= " ORDER BY nom ASC";
+	if (GETPOST("filter")) $sql .= " AND ".GETPOST("filter", "alpha"); // Add other filters
+	$sql .= " ORDER BY nom ASC";
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-		    $label=$row['nom'];
-		    if ($socid) $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+		    $label = $row['nom'];
+		    if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
 	        $row_array['key'] = $row['rowid'];
 
-	        array_push($return_arr,$row_array);
+	        array_push($return_arr, $row_array);
 	    }
 
 	    echo json_encode($return_arr);
 	}
 	else
 	{
-	    echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
+	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 }
 else
 {
-    echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter'));
+    echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }

Braces +41 added lines, -18 removed lines

@@ -23,12 +23,25 @@ 
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
 
 require '../main.inc.php';
 
@@ -56,8 +69,12 @@ 
 
 	// Define filter on text typed
 	$socid = $_GET['newcompany']?$_GET['newcompany']:'';
-	if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
-	if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+	if (! $socid) {
+	    $socid = $_GET['socid']?$_GET['socid']:'';
+	}
+	if (! $socid) {
+	    $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+	}
 
 	$sql = "SELECT rowid, nom";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -66,22 +83,28 @@ 
 	{
         $sql.=" AND (";
         // Add criteria on name/code
-        if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+        if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) {
+            // Can use index
         {
             $sql.="nom LIKE '" . $db->escape($socid) . "%'";
+        }
             $sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'";
             $sql.=" OR code_fournisseur LIKE '" . $db->escape($socid) . "%'";
-        }
-        else
+        } else
         {
     		$sql.="nom LIKE '%" . $db->escape($socid) . "%'";
     		$sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
     		$sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
         }
-		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
+		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) {
+		    $sql.=" OR rowid = '" . $db->escape($socid) . "'";
+		}
 		$sql.=")";
 	}
-	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
+	if (GETPOST("filter")) {
+	    $sql.= " AND ".GETPOST("filter","alpha");
+	}
+	// Add other filters
 	$sql.= " ORDER BY nom ASC";
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
@@ -91,7 +114,9 @@ 
 		while ($row = $db->fetch_array($resql))
 		{
 		    $label=$row['nom'];
-		    if ($socid) $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+		    if ($socid) {
+		        $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+		    }
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
 	        $row_array['key'] = $row['rowid'];
@@ -100,13 +125,11 @@ 
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else
+	} else
 	{
 	    echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
 	}
-}
-else
+} else
 {
     echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter'));
 }

dolibarr/htdocs/societe/document.php

Spacing +29 added lines, -29 removed lines

@@ -34,9 +34,9 @@ 
 
 $langs->loadLangs(array("companies", "other"));
 
-$action=GETPOST('action','aZ09');
-$confirm=GETPOST('confirm');
-$id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -48,27 +48,27 @@ 
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$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 = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position_name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "position_name";
 
 $object = new Societe($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$result = $object->fetch($id, $ref);
 
-	$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
-	$courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
+	$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
+	$courrier_dir = $conf->societe->multidir_output[$object->entity]."/courrier/".get_exdir($object->id, 0, 0, 0, $object, 'thirdparty');
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartydocument','globalcard'));
+$hookmanager->initHooks(array('thirdpartydocument', 'globalcard'));
 
 
 
@@ -76,7 +76,7 @@ 
  * Actions
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
@@ -85,35 +85,35 @@ 
 
 $form = new Form($db);
 
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Files");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Files");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Files");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 if ($object->id)
 {
 	/*
 	 * Show tabs
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
-	$form=new Form($db);
+	$form = new Form($db);
 
 	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -121,7 +121,7 @@ 
 	print '<table class="border centpercent">';
 
 	// Prefix
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
@@ -148,7 +148,7 @@ 
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print '</table>';
 
@@ -159,12 +159,12 @@ 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;
 	$permtoedit = $user->rights->societe->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	accessforbidden('',0,0);
+	accessforbidden('', 0, 0);
 }
 
 // End of page