alxarafe / alixar

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);
+    }
 }

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';
     }
 }
 

dolibarr/htdocs/societe/ajaxcountries.php

Indentation +20 added lines, -20 removed lines

@@ -52,27 +52,27 @@
 // Generate list of countries
 if (! empty($country))
 {
-	global $langs;
-	$langs->load("dict");
+    global $langs;
+    $langs->load("dict");
 
-	$sql = "SELECT rowid, code, label, active";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-	$sql.= " WHERE active = 1 AND label LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
-	$sql.= " ORDER BY label ASC";
+    $sql = "SELECT rowid, code, label, active";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_country";
+    $sql.= " WHERE active = 1 AND label LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
+    $sql.= " ORDER BY label ASC";
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		print '<ul>';
-		while($country = $db->fetch_object($resql))
-		{
-			print '<li>';
-			// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
-			print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->label!='-'?$country->label:'&nbsp;'));
-			print '<span class="informal" style="display:none">'.$country->rowid.'-idcache</span>';
-			print '</li>';
-		}
-		print '</ul>';
-	}
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        print '<ul>';
+        while($country = $db->fetch_object($resql))
+        {
+            print '<li>';
+            // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
+            print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->label!='-'?$country->label:'&nbsp;'));
+            print '<span class="informal" style="display:none">'.$country->rowid.'-idcache</span>';
+            print '</li>';
+        }
+        print '</ul>';
+    }
 }
 

dolibarr/htdocs/societe/index.php

Indentation +109 added lines, -109 removed lines

@@ -62,32 +62,32 @@ 
     // Search thirdparty
     if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
     {
-    	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
+        $listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
     }
     // Search contact/address
     if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
     {
-    	$listofsearchfields['search_contact']=array('text'=>'Contact');
+        $listofsearchfields['search_contact']=array('text'=>'Contact');
     }
 
     if (count($listofsearchfields))
     {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i=0;
-    	foreach($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-    	print '</form>';
-    	print '<br>';
+        print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<table class="noborder nohover centpercent">';
+        $i=0;
+        foreach($listofsearchfields as $key => $value)
+        {
+            if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
+            print '<tr '.$bc[false].'>';
+            print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+            if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+            print '</tr>';
+            $i++;
+        }
+        print '</table>';
+        print '</form>';
+        print '<br>';
     }
 }
 
@@ -97,10 +97,10 @@ 
  */
 
 $third = array(
-		'customer' => 0,
-		'prospect' => 0,
-		'supplier' => 0,
-		'other' =>0
+        'customer' => 0,
+        'prospect' => 0,
+        'supplier' => 0,
+        'other' =>0
 );
 $total=0;
 
@@ -140,13 +140,13 @@ 
     if (! empty($conf->societe->enabled)) $dataseries[]=array($langs->trans("Others"), round($third['other']));
     include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
     $dolgraph = new DolGraph();
-	$dolgraph->SetData($dataseries);
-	$dolgraph->setShowLegend(1);
-	$dolgraph->setShowPercent(1);
-	$dolgraph->SetType(array('pie'));
-	$dolgraph->setWidth('100%');
-	$dolgraph->draw('idgraphthirdparties');
-	print $dolgraph->show();
+    $dolgraph->SetData($dataseries);
+    $dolgraph->setShowLegend(1);
+    $dolgraph->setShowPercent(1);
+    $dolgraph->SetType(array('pie'));
+    $dolgraph->setWidth('100%');
+    $dolgraph->draw('idgraphthirdparties');
+    print $dolgraph->show();
     print '</td></tr>'."\n";
 }
 else
@@ -180,80 +180,80 @@ 
 
 if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES))
 {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	$elementtype = 'societe';
-
-	print '<br>';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder nohover" width="100%">';
-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
-	print '<tr '.$bc[0].'><td align="center" colspan="2">';
-	$sql = "SELECT c.label, count(*) as nb";
-	$sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
-	$sql.= " WHERE c.type = 2";
-	if (! is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql.= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
-	$sql.= " AND c.entity IN (".getEntity('category').")";
-	$sql.= " GROUP BY c.label";
-	$total=0;
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$num = $db->num_rows($result);
-		$i=0;
-		if (! empty($conf->use_javascript_ajax) )
-		{
-			$dataseries=array();
-			$rest=0;
-			$nbmax=10;
-
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-				if ($i < $nbmax)
-				{
-					$dataseries[]=array($obj->label, round($obj->nb));
-				}
-				else
-				{
-					$rest+=$obj->nb;
-				}
-				$total+=$obj->nb;
-				$i++;
-			}
-			if ($i > $nbmax)
-			{
-				$dataseries[]=array($langs->trans("Other"), round($rest));
-			}
-			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-			$dolgraph = new DolGraph();
-			$dolgraph->SetData($dataseries);
-			$dolgraph->setShowLegend(1);
-			$dolgraph->setShowPercent(1);
-			$dolgraph->SetType(array('pie'));
-			$dolgraph->setWidth('100%');
-			$dolgraph->draw('idgraphcateg');
-			print $dolgraph->show();
-		}
-		else
-		{
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-
-				print '<tr class="oddeven"><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
-				$total+=$obj->nb;
-				$i++;
-			}
-		}
-	}
-	print '</td></tr>';
-	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">';
-	print $total;
-	print '</td></tr>';
-	print '</table>';
-	print '</div>';
+    require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+    $elementtype = 'societe';
+
+    print '<br>';
+
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
+    print '<tr '.$bc[0].'><td align="center" colspan="2">';
+    $sql = "SELECT c.label, count(*) as nb";
+    $sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
+    $sql.= " WHERE c.type = 2";
+    if (! is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql.= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
+    $sql.= " AND c.entity IN (".getEntity('category').")";
+    $sql.= " GROUP BY c.label";
+    $total=0;
+    $result = $db->query($sql);
+    if ($result)
+    {
+        $num = $db->num_rows($result);
+        $i=0;
+        if (! empty($conf->use_javascript_ajax) )
+        {
+            $dataseries=array();
+            $rest=0;
+            $nbmax=10;
+
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                if ($i < $nbmax)
+                {
+                    $dataseries[]=array($obj->label, round($obj->nb));
+                }
+                else
+                {
+                    $rest+=$obj->nb;
+                }
+                $total+=$obj->nb;
+                $i++;
+            }
+            if ($i > $nbmax)
+            {
+                $dataseries[]=array($langs->trans("Other"), round($rest));
+            }
+            include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+            $dolgraph = new DolGraph();
+            $dolgraph->SetData($dataseries);
+            $dolgraph->setShowLegend(1);
+            $dolgraph->setShowPercent(1);
+            $dolgraph->SetType(array('pie'));
+            $dolgraph->setWidth('100%');
+            $dolgraph->draw('idgraphcateg');
+            print $dolgraph->show();
+        }
+        else
+        {
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+
+                print '<tr class="oddeven"><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
+                $total+=$obj->nb;
+                $i++;
+            }
+        }
+    }
+    print '</td></tr>';
+    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">';
+    print $total;
+    print '</td></tr>';
+    print '</table>';
+    print '</div>';
 }
 
 //print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
@@ -324,20 +324,20 @@ 
             print '<td align="center">';
             if ($thirdparty_static->client==1 || $thirdparty_static->client==3)
             {
-            	$thirdparty_static->name=$langs->trans("Customer");
-            	print $thirdparty_static->getNomUrl(0,'customer',0,1);
+                $thirdparty_static->name=$langs->trans("Customer");
+                print $thirdparty_static->getNomUrl(0,'customer',0,1);
             }
             if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
             if (($thirdparty_static->client==2 || $thirdparty_static->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
             {
-            	$thirdparty_static->name=$langs->trans("Prospect");
-            	print $thirdparty_static->getNomUrl(0,'prospect',0,1);
+                $thirdparty_static->name=$langs->trans("Prospect");
+                print $thirdparty_static->getNomUrl(0,'prospect',0,1);
             }
             if (! empty($conf->fournisseur->enabled) && $thirdparty_static->fournisseur)
             {
                 if ($thirdparty_static->client) print " / ";
-            	$thirdparty_static->name=$langs->trans("Supplier");
-            	print $thirdparty_static->getNomUrl(0,'supplier',0,1);
+                $thirdparty_static->name=$langs->trans("Supplier");
+                print $thirdparty_static->getNomUrl(0,'supplier',0,1);
             }
             print '</td>';
             // Last modified date

dolibarr/htdocs/societe/list.php

Indentation +597 added lines, -597 removed lines

@@ -125,20 +125,20 @@ 
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	's.nom'=>"ThirdPartyName",
-	's.name_alias'=>"AliasNameShort",
-	's.code_client'=>"CustomerCode",
-	's.code_fournisseur'=>"SupplierCode",
-	's.code_compta'=>"CustomerAccountancyCodeShort",
-	's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
-	's.email'=>"EMail",
-	's.url'=>"URL",
-	's.tva_intra'=>"VATIntra",
-	's.siren'=>"ProfId1",
-	's.siret'=>"ProfId2",
-	's.ape'=>"ProfId3",
-	's.phone'=>"Phone",
-	's.fax'=>"Fax",
+    's.nom'=>"ThirdPartyName",
+    's.name_alias'=>"AliasNameShort",
+    's.code_client'=>"CustomerCode",
+    's.code_fournisseur'=>"SupplierCode",
+    's.code_compta'=>"CustomerAccountancyCodeShort",
+    's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
+    's.email'=>"EMail",
+    's.url'=>"URL",
+    's.tva_intra'=>"VATIntra",
+    's.siren'=>"ProfId1",
+    's.siret'=>"ProfId2",
+    's.ape'=>"ProfId3",
+    's.phone'=>"Phone",
+    's.fax'=>"Fax",
 );
 if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4']='ProfId4';
 if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5']='ProfId5';
@@ -166,47 +166,47 @@ 
 $checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $arrayfields=array(
-	's.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0)),
-	's.nom'=>array('label'=>"ThirdPartyName", 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
-	's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
-	's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>$checkedcustomercode),
-	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
-	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'checked'=>$checkedcustomeraccountcode),
-	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
-	's.town'=>array('label'=>"Town", 'checked'=>1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1),
-	'state.nom'=>array('label'=>"State", 'checked'=>0),
-	'region.nom'=>array('label'=>"Region", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
-	's.email'=>array('label'=>"Email", 'checked'=>0),
-	's.url'=>array('label'=>"Url", 'checked'=>0),
-	's.phone'=>array('label'=>"Phone", 'checked'=>1),
-	's.fax'=>array('label'=>"Fax", 'checked'=>0),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	'staff.code'=>array('label'=>"Staff", 'checked'=>0),
-	's.siren'=>array('label'=>"ProfId1Short", 'checked'=>$checkedprofid1),
-	's.siret'=>array('label'=>"ProfId2Short", 'checked'=>$checkedprofid2),
-	's.ape'=>array('label'=>"ProfId3Short", 'checked'=>$checkedprofid3),
-	's.idprof4'=>array('label'=>"ProfId4Short", 'checked'=>$checkedprofid4),
-	's.idprof5'=>array('label'=>"ProfId5Short", 'checked'=>$checkedprofid5),
-	's.idprof6'=>array('label'=>"ProfId6Short", 'checked'=>$checkedprofid6),
-	's.tva_intra'=>array('label'=>"VATIntra", 'checked'=>0),
-	'customerorsupplier'=>array('label'=>'Nature', 'checked'=>1),
-	's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'checked'=>$checkprospectlevel),
-	's.fk_stcomm'=>array('label'=>"StatusProsp", 'checked'=>$checkstcomm),
-	's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	's.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
+    's.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0)),
+    's.nom'=>array('label'=>"ThirdPartyName", 'checked'=>1),
+    's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
+    's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+    's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>$checkedcustomercode),
+    's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
+    's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'checked'=>$checkedcustomeraccountcode),
+    's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
+    's.town'=>array('label'=>"Town", 'checked'=>1),
+    's.zip'=>array('label'=>"Zip", 'checked'=>1),
+    'state.nom'=>array('label'=>"State", 'checked'=>0),
+    'region.nom'=>array('label'=>"Region", 'checked'=>0),
+    'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
+    's.email'=>array('label'=>"Email", 'checked'=>0),
+    's.url'=>array('label'=>"Url", 'checked'=>0),
+    's.phone'=>array('label'=>"Phone", 'checked'=>1),
+    's.fax'=>array('label'=>"Fax", 'checked'=>0),
+    'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
+    'staff.code'=>array('label'=>"Staff", 'checked'=>0),
+    's.siren'=>array('label'=>"ProfId1Short", 'checked'=>$checkedprofid1),
+    's.siret'=>array('label'=>"ProfId2Short", 'checked'=>$checkedprofid2),
+    's.ape'=>array('label'=>"ProfId3Short", 'checked'=>$checkedprofid3),
+    's.idprof4'=>array('label'=>"ProfId4Short", 'checked'=>$checkedprofid4),
+    's.idprof5'=>array('label'=>"ProfId5Short", 'checked'=>$checkedprofid5),
+    's.idprof6'=>array('label'=>"ProfId6Short", 'checked'=>$checkedprofid6),
+    's.tva_intra'=>array('label'=>"VATIntra", 'checked'=>0),
+    'customerorsupplier'=>array('label'=>'Nature', 'checked'=>1),
+    's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'checked'=>$checkprospectlevel),
+    's.fk_stcomm'=>array('label'=>"StatusProsp", 'checked'=>$checkstcomm),
+    's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
+    's.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+    's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+    's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val)
-   {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-   }
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 
 $object = new Societe($db);
@@ -225,67 +225,67 @@ 
 
 if (empty($reshook))
 {
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	// Did we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-	{
-		$search_id='';
-		$search_nom='';
-		$search_alias='';
-		$search_categ_cus=0;
-		$search_categ_sup=0;
-		$search_sale='';
-		$search_barcode="";
-		$search_customer_code='';
-		$search_supplier_code='';
-		$search_account_customer_code='';
-		$search_account_supplier_code='';
-		$search_town="";
-		$search_zip="";
-		$search_state="";
-		$search_country='';
-		$search_email='';
-		$search_phone='';
-		$search_fax='';
-		$search_url='';
-		$search_idprof1='';
-		$search_idprof2='';
-		$search_idprof3='';
-		$search_idprof4='';
-		$search_idprof5='';
-		$search_idprof6='';
-		$search_vat='';
-		$search_type='';
-		$search_type_thirdparty='';
-		$search_staff='';
-		$search_status=-1;
-		$search_stcomm='';
-	 	$search_level='';
-	 	$search_import_key='';
-	 	$toselect='';
-		$search_array_options=array();
-	}
-
-	// Mass actions
-	$objectclass='Societe';
-	$objectlabel='ThirdParty';
-	$permtoread = $user->rights->societe->lire;
-	$permtodelete = $user->rights->societe->supprimer;
-	$uploaddir = $conf->societe->dir_output;
-	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
-	if ($action == 'setstcomm')
-	{
-		$object = new Client($db);
-		$result=$object->fetch(GETPOST('stcommsocid'));
-		$object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
-		$result=$object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
-
-		$action='';
-	}
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Did we click on purge search criteria ?
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    {
+        $search_id='';
+        $search_nom='';
+        $search_alias='';
+        $search_categ_cus=0;
+        $search_categ_sup=0;
+        $search_sale='';
+        $search_barcode="";
+        $search_customer_code='';
+        $search_supplier_code='';
+        $search_account_customer_code='';
+        $search_account_supplier_code='';
+        $search_town="";
+        $search_zip="";
+        $search_state="";
+        $search_country='';
+        $search_email='';
+        $search_phone='';
+        $search_fax='';
+        $search_url='';
+        $search_idprof1='';
+        $search_idprof2='';
+        $search_idprof3='';
+        $search_idprof4='';
+        $search_idprof5='';
+        $search_idprof6='';
+        $search_vat='';
+        $search_type='';
+        $search_type_thirdparty='';
+        $search_staff='';
+        $search_status=-1;
+        $search_stcomm='';
+            $search_level='';
+            $search_import_key='';
+            $toselect='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    $objectclass='Societe';
+    $objectlabel='ThirdParty';
+    $permtoread = $user->rights->societe->lire;
+    $permtodelete = $user->rights->societe->supprimer;
+    $uploaddir = $conf->societe->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+    if ($action == 'setstcomm')
+    {
+        $object = new Client($db);
+        $result=$object->fetch(GETPOST('stcommsocid'));
+        $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
+        $result=$object->update($object->id, $user);
+        if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+
+        $action='';
+    }
 }
 
 if ($search_status=='') $search_status=1; // always display active thirdparty first
@@ -328,13 +328,13 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	while ($obj = $db->fetch_object($resql))
-	{
-		// Compute level text
-		$level=$langs->trans($obj->code);
-		if ($level == $obj->code) $level=$langs->trans($obj->label);
-		$tab_level[$obj->code] = $level;
-	}
+    while ($obj = $db->fetch_object($resql))
+    {
+        // Compute level text
+        $level=$langs->trans($obj->code);
+        if ($level == $obj->code) $level=$langs->trans($obj->label);
+        $tab_level[$obj->code] = $level;
+    }
 }
 else dol_print_error($db);
 
@@ -435,13 +435,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -449,8 +449,8 @@ 
 $resql = $db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -459,21 +459,21 @@ 
 
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list')
 {
-	$obj = $db->fetch_object($resql);
-	$id = $obj->rowid;
-	if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
-              if( $obj->client > 0) {
-                       header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
-                       exit;
-               }
-               if( $obj->fournisseur > 0){
-                       header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
-                       exit;
-               }
-       }
-
-	header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
-	exit;
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+                if( $obj->client > 0) {
+                        header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
+                        exit;
+                }
+                if( $obj->fournisseur > 0){
+                        header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
+                        exit;
+                }
+        }
+
+    header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
+    exit;
 }
 
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -524,12 +524,12 @@ 
 // Show delete result message
 if (GETPOST('delsoc'))
 {
-	setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
+    setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
 }
 
 // List of mass actions available
 $arrayofmassactions =  array(
-	'presend'=>$langs->trans("SendByMail"),
+    'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
@@ -540,20 +540,20 @@ 
 $newcardbutton='';
 if ($user->rights->societe->creer)
 {
-	$typefilter='';
-	$label='MenuNewThirdParty';
-
-	if(! empty($type))
-	{
-		$typefilter = '&amp;type='.$type;
-		if($type == 'p') $label='MenuNewProspect';
-		if($type == 'c') $label='MenuNewCustomer';
-		if($type == 'f') $label='NewSupplier';
-	}
-
-	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter.'"><span class="valignmiddle">'.$langs->trans($label).'</span>';
-	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-	$newcardbutton.= '</a>';
+    $typefilter='';
+    $label='MenuNewThirdParty';
+
+    if(! empty($type))
+    {
+        $typefilter = '&amp;type='.$type;
+        if($type == 'p') $label='MenuNewProspect';
+        if($type == 'c') $label='MenuNewCustomer';
+        if($type == 'f') $label='NewSupplier';
+    }
+
+    $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter.'"><span class="valignmiddle">'.$langs->trans($label).'</span>';
+    $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+    $newcardbutton.= '</a>';
 }
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter" autocomplete="off">';
@@ -570,13 +570,13 @@ 
 $textprofid=array();
 foreach(array(1,2,3,4,5,6) as $key)
 {
-	$label=$langs->transnoentities("ProfId".$key.$mysoc->country_code);
-	$textprofid[$key]='';
-	if ($label != "ProfId".$key.$mysoc->country_code)
-	{	// Get only text between ()
-		if (preg_match('/\((.*)\)/i',$label,$reg)) $label=$reg[1];
-		$textprofid[$key]=$langs->trans("ProfIdShortDesc",$key,$mysoc->country_code,$label);
-	}
+    $label=$langs->transnoentities("ProfId".$key.$mysoc->country_code);
+    $textprofid[$key]='';
+    if ($label != "ProfId".$key.$mysoc->country_code)
+    {	// Get only text between ()
+        if (preg_match('/\((.*)\)/i',$label,$reg)) $label=$reg[1];
+        $textprofid[$key]=$langs->trans("ProfIdShortDesc",$key,$mysoc->country_code,$label);
+    }
 }
 
 $topicmail="Information";
@@ -587,51 +587,51 @@ 
 
 if ($search_all)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'</div>';
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'</div>';
 }
 
 // Filter on categories
 $moreforfilter='';
 if (empty($type) || $type == 'c' || $type == 'p')
 {
-	if (! empty($conf->categorie->enabled))
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
-		$moreforfilter.=$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
-	 	$moreforfilter.='</div>';
-	}
+    if (! empty($conf->categorie->enabled))
+    {
+        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        $moreforfilter.='<div class="divsearchfield">';
+            $moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
+        $moreforfilter.=$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
+            $moreforfilter.='</div>';
+    }
 }
 if (empty($type) || $type == 'f')
 {
-	if (! empty($conf->categorie->enabled))
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-		$moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
-		$moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
-		$moreforfilter.='</div>';
-	}
+    if (! empty($conf->categorie->enabled))
+    {
+        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        $moreforfilter.='<div class="divsearchfield">';
+        $moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
+        $moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
+        $moreforfilter.='</div>';
+    }
 }
 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)
 {
- 	$moreforfilter.='<div class="divsearchfield">';
- 	$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
-	$moreforfilter.='</div>';
+        $moreforfilter.='<div class="divsearchfield">';
+        $moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
+    $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
+    $moreforfilter.='</div>';
 }
 if ($moreforfilter)
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	$parameters=array('type'=>$type);
-	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    $parameters=array('type'=>$type);
+    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -647,217 +647,217 @@ 
 print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['s.rowid']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	if (! empty($search_nom_only) && empty($search_nom)) $search_nom=$search_nom_only;
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_nom" value="'.dol_escape_htmltag($search_nom).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    if (! empty($search_nom_only) && empty($search_nom)) $search_nom=$search_nom_only;
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_nom" value="'.dol_escape_htmltag($search_nom).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.name_alias']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_alias" value="'.dol_escape_htmltag($search_alias).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_alias" value="'.dol_escape_htmltag($search_alias).'">';
+    print '</td>';
 }
 // Barcode
 if (! empty($arrayfields['s.barcode']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_barcode" value="'.dol_escape_htmltag($search_barcode).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_barcode" value="'.dol_escape_htmltag($search_barcode).'">';
+    print '</td>';
 }
 // Customer code
 if (! empty($arrayfields['s.code_client']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_customer_code" value="'.dol_escape_htmltag($search_customer_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_customer_code" value="'.dol_escape_htmltag($search_customer_code).'">';
+    print '</td>';
 }
 // Supplier code
 if (! empty($arrayfields['s.code_fournisseur']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_supplier_code" value="'.dol_escape_htmltag($search_supplier_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_supplier_code" value="'.dol_escape_htmltag($search_supplier_code).'">';
+    print '</td>';
 }
 // Account Customer code
 if (! empty($arrayfields['s.code_compta']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_account_customer_code" value="'.dol_escape_htmltag($search_account_customer_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_account_customer_code" value="'.dol_escape_htmltag($search_account_customer_code).'">';
+    print '</td>';
 }
 // Account Supplier code
 if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat maxwidth50" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat maxwidth50" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
+    print '</td>';
 }
 // Town
 if (! empty($arrayfields['s.town']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
+    print '</td>';
 }
 // Zip
 if (! empty($arrayfields['s.zip']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
+    print '</td>';
 }
 // State
 if (! empty($arrayfields['state.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+    print '</td>';
 }
 // Region
 if (! empty($arrayfields['region.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
+    print '</td>';
 }
 // Country
 if (! empty($arrayfields['country.code_iso']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+    print '</td>';
 }
 // Company type
 if (! empty($arrayfields['typent.code']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-	print '</td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+    print '</td>';
 }
 // Staff
 if (! empty($arrayfields['staff.code']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, $sort, 'maxwidth100');
-	print '</td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, $sort, 'maxwidth100');
+    print '</td>';
 }
 if (! empty($arrayfields['s.email']['checked']))
 {
-	// Email
-	print '<td class="liste_titre">';
-	print '<input class="flat searchemail maxwidth50" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
-	print '</td>';
+    // Email
+    print '<td class="liste_titre">';
+    print '<input class="flat searchemail maxwidth50" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.phone']['checked']))
 {
-	// Phone
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
-	print '</td>';
+    // Phone
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.fax']['checked']))
 {
-	// Fax
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_fax" value="'.dol_escape_htmltag($search_fax).'">';
-	print '</td>';
+    // Fax
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_fax" value="'.dol_escape_htmltag($search_fax).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.url']['checked']))
 {
-	// Url
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_url" value="'.dol_escape_htmltag($search_url).'">';
-	print '</td>';
+    // Url
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_url" value="'.dol_escape_htmltag($search_url).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.siren']['checked']))
 {
-	// IdProf1
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof1" value="'.dol_escape_htmltag($search_idprof1).'">';
-	print '</td>';
+    // IdProf1
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof1" value="'.dol_escape_htmltag($search_idprof1).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.siret']['checked']))
 {
-	// IdProf2
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof2" value="'.dol_escape_htmltag($search_idprof2).'">';
-	print '</td>';
+    // IdProf2
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof2" value="'.dol_escape_htmltag($search_idprof2).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.ape']['checked']))
 {
-	// IdProf3
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof3" value="'.dol_escape_htmltag($search_idprof3).'">';
-	print '</td>';
+    // IdProf3
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof3" value="'.dol_escape_htmltag($search_idprof3).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.idprof4']['checked']))
 {
-	// IdProf4
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof4" value="'.dol_escape_htmltag($search_idprof4).'">';
-	print '</td>';
+    // IdProf4
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof4" value="'.dol_escape_htmltag($search_idprof4).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.idprof5']['checked']))
 {
-	// IdProf5
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof5" value="'.dol_escape_htmltag($search_idprof5).'">';
-	print '</td>';
+    // IdProf5
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof5" value="'.dol_escape_htmltag($search_idprof5).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.idprof6']['checked']))
 {
-	// IdProf6
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
-	print '</td>';
+    // IdProf6
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.tva_intra']['checked']))
 {
-	// Vat number
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_vat" value="'.dol_escape_htmltag($search_vat).'">';
-	print '</td>';
+    // Vat number
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_vat" value="'.dol_escape_htmltag($search_vat).'">';
+    print '</td>';
 }
 
 // Type (customer/prospect/supplier)
 if (! empty($arrayfields['customerorsupplier']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
-	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
-	print '<select class="flat" name="search_type">';
-	print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-	//if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-	print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
-	print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
-	print '</select></td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
+    if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+    print '<select class="flat" name="search_type">';
+    print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
+    if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
+    if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+    //if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+    print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
+    print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
+    print '</select></td>';
 }
 // Prospect level
 if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
 {
- 	print '<td class="liste_titre" align="center">';
- 	print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
-	print '</td>';
+        print '<td class="liste_titre" align="center">';
+        print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
+    print '</td>';
 }
 // Prospect status
 if (! empty($arrayfields['s.fk_stcomm']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	$arraystcomm=array();
-	foreach($prospectstatic->cacheprospectstatus as $key => $val)
-	{
-		$arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
-	}
-	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
-	print '</td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    $arraystcomm=array();
+    foreach($prospectstatic->cacheprospectstatus as $key => $val)
+    {
+        $arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
+    }
+    print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
+    print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -869,27 +869,27 @@ 
 // Date creation
 if (! empty($arrayfields['s.datec']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // Date modification
 if (! empty($arrayfields['s.tms']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // Status
 if (! empty($arrayfields['s.status']['checked']))
 {
-	print '<td class="liste_titre center minwidth75imp">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $search_status, 1);
-	print '</td>';
+    print '<td class="liste_titre center minwidth75imp">';
+    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $search_status, 1);
+    print '</td>';
 }
 if (! empty($arrayfields['s.import_key']['checked']))
 {
-	print '<td class="liste_titre center">';
-	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
-	print '</td>';
+    print '<td class="liste_titre center">';
+    print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
+    print '</td>';
 }
 // Action column
 print '<td class="liste_titre" align="right">';
@@ -947,289 +947,289 @@ 
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-	$obj = $db->fetch_object($resql);
-
-	$companystatic->id=$obj->rowid;
-	$companystatic->name=$obj->name;
-	$companystatic->name_alias=$obj->name_alias;
-	$companystatic->logo=$obj->logo;
-	$companystatic->canvas=$obj->canvas;
-	$companystatic->client=$obj->client;
-	$companystatic->status=$obj->status;
-	$companystatic->email=$obj->email;
-	$companystatic->fournisseur=$obj->fournisseur;
-	$companystatic->code_client=$obj->code_client;
-	$companystatic->code_fournisseur=$obj->code_fournisseur;
-
-	$companystatic->code_compta_client=$obj->code_compta;
-	$companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
-
-   	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
-
-	print '<tr class="oddeven">';
-	if (! empty($arrayfields['s.rowid']['checked']))
-	{
-		print '<td class="tdoverflowmax50">';
-		print $obj->rowid;
-		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.nom']['checked']))
-	{
-		$savalias = $obj->name_alias;
-		if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
-		print '<td class="tdoverflowmax200">';
-		print $companystatic->getNomUrl(1, '', 100, 0, 1);
-		print "</td>\n";
-		$companystatic->name_alias = $savalias;
+    $obj = $db->fetch_object($resql);
+
+    $companystatic->id=$obj->rowid;
+    $companystatic->name=$obj->name;
+    $companystatic->name_alias=$obj->name_alias;
+    $companystatic->logo=$obj->logo;
+    $companystatic->canvas=$obj->canvas;
+    $companystatic->client=$obj->client;
+    $companystatic->status=$obj->status;
+    $companystatic->email=$obj->email;
+    $companystatic->fournisseur=$obj->fournisseur;
+    $companystatic->code_client=$obj->code_client;
+    $companystatic->code_fournisseur=$obj->code_fournisseur;
+
+    $companystatic->code_compta_client=$obj->code_compta;
+    $companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
+
+        $companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
+
+    print '<tr class="oddeven">';
+    if (! empty($arrayfields['s.rowid']['checked']))
+    {
+        print '<td class="tdoverflowmax50">';
+        print $obj->rowid;
+        print "</td>\n";
         if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.name_alias']['checked']))
-	{
-		print '<td class="tdoverflowmax200">';
-		print $companystatic->name_alias;
-		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Barcode
-	if (! empty($arrayfields['s.barcode']['checked']))
-	{
-		print '<td>'.$obj->barcode.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Customer code
-	if (! empty($arrayfields['s.code_client']['checked']))
-	{
-		print '<td class="nowraponall">'.$obj->code_client.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Supplier code
-	if (! empty($arrayfields['s.code_fournisseur']['checked']))
-	{
-		print '<td class="nowraponall">'.$obj->code_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Account customer code
-	if (! empty($arrayfields['s.code_compta']['checked']))
-	{
-		print '<td>'.$obj->code_compta.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Account supplier code
-	if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
-	{
-		print '<td>'.$obj->code_compta_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Town
-	if (! empty($arrayfields['s.town']['checked']))
-	{
-		print "<td>".$obj->town."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Zip
-	if (! empty($arrayfields['s.zip']['checked']))
-	{
-		print "<td>".$obj->zip."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// State
-	if (! empty($arrayfields['state.nom']['checked']))
-	{
-		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Region
-	if (! empty($arrayfields['region.nom']['checked']))
-	{
-		print "<td>".$obj->region_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
-	{
-		print '<td align="center">';
-		$tmparray=getCountry($obj->fk_pays,'all');
-		print $tmparray['label'];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Type ent
-	if (! empty($arrayfields['typent.code']['checked']))
-	{
-		print '<td align="center">';
-		if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-		print $typenArray[$obj->typent_code];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Staff
-	if (! empty($arrayfields['staff.code']['checked']))
-	{
-		print '<td align="center">';
-		if (! is_array($staffArray) || count($staffArray)==0) $staffArray = $formcompany->effectif_array(1);
-		print $staffArray[$obj->staff_code];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.email']['checked']))
-	{
-		print "<td>".$obj->email."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.phone']['checked']))
-	{
-		print "<td>".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid)."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.fax']['checked']))
-	{
-		print "<td>".dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid)."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.url']['checked']))
-	{
-		print "<td>".$obj->url."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.siren']['checked']))
-	{
-		print "<td>".$obj->idprof1."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.siret']['checked']))
-	{
-		print "<td>".$obj->idprof2."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.ape']['checked']))
-	{
-		print "<td>".$obj->idprof3."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.idprof4']['checked']))
-	{
-		print "<td>".$obj->idprof4."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.idprof5']['checked']))
-	{
-		print "<td>".$obj->idprof5."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.idprof6']['checked']))
-	{
-		print "<td>".$obj->idprof6."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.tva_intra']['checked']))
-	{
-		print "<td>".$obj->tva_intra."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Type
-	if (! empty($arrayfields['customerorsupplier']['checked']))
-	{
-		print '<td align="center">';
-		$s='';
-		if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-		{
-	  		$companystatic->name=$langs->trans("Customer");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'customer',0,1);
-		}
-		if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
-			if ($s) $s.=" / ";
-			$companystatic->name=$langs->trans("Prospect");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'prospect',0,1);
-		}
-		if ((! empty($conf->fournisseur->enabled) || ! empty($conf->supplier_proposal->enabled)) && $obj->fournisseur)
-		{
-			if ($s) $s.=" / ";
-			$companystatic->name=$langs->trans("Supplier");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'supplier',0,1);
-		}
-		print $s;
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-
-	if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
-	{
-		// Prospect level
-		print '<td align="center">';
-		print $companystatic->getLibProspLevel();
-		print "</td>";
-		if (! $i) $totalarray['nbfield']++;
-	}
-
-	if (! empty($arrayfields['s.fk_stcomm']['checked']))
-	{
-		// Prospect status
-		print '<td align="center" class="nowrap"><div class="nowrap">';
-		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
-		print '</div> - <div class="inline-block">';
-		foreach($prospectstatic->cacheprospectstatus as $key => $val)
-		{
-			$titlealt='default';
-			if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
-		}
-		print '</div></div></td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (! empty($arrayfields['s.datec']['checked']))
-	{
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Date modification
-	if (! empty($arrayfields['s.tms']['checked']))
-	{
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Status
-	if (! empty($arrayfields['s.status']['checked']))
-	{
-		print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.import_key']['checked']))
-	{
-		print '<td class="tdoverflowmax100">';
-		print $obj->import_key;
-		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print '</tr>'."\n";
-	$i++;
+    }
+    if (! empty($arrayfields['s.nom']['checked']))
+    {
+        $savalias = $obj->name_alias;
+        if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
+        print '<td class="tdoverflowmax200">';
+        print $companystatic->getNomUrl(1, '', 100, 0, 1);
+        print "</td>\n";
+        $companystatic->name_alias = $savalias;
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.name_alias']['checked']))
+    {
+        print '<td class="tdoverflowmax200">';
+        print $companystatic->name_alias;
+        print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Barcode
+    if (! empty($arrayfields['s.barcode']['checked']))
+    {
+        print '<td>'.$obj->barcode.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Customer code
+    if (! empty($arrayfields['s.code_client']['checked']))
+    {
+        print '<td class="nowraponall">'.$obj->code_client.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Supplier code
+    if (! empty($arrayfields['s.code_fournisseur']['checked']))
+    {
+        print '<td class="nowraponall">'.$obj->code_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Account customer code
+    if (! empty($arrayfields['s.code_compta']['checked']))
+    {
+        print '<td>'.$obj->code_compta.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Account supplier code
+    if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
+    {
+        print '<td>'.$obj->code_compta_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Town
+    if (! empty($arrayfields['s.town']['checked']))
+    {
+        print "<td>".$obj->town."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Zip
+    if (! empty($arrayfields['s.zip']['checked']))
+    {
+        print "<td>".$obj->zip."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print "<td>".$obj->state_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Region
+    if (! empty($arrayfields['region.nom']['checked']))
+    {
+        print "<td>".$obj->region_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Country
+    if (! empty($arrayfields['country.code_iso']['checked']))
+    {
+        print '<td align="center">';
+        $tmparray=getCountry($obj->fk_pays,'all');
+        print $tmparray['label'];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Type ent
+    if (! empty($arrayfields['typent.code']['checked']))
+    {
+        print '<td align="center">';
+        if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+        print $typenArray[$obj->typent_code];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Staff
+    if (! empty($arrayfields['staff.code']['checked']))
+    {
+        print '<td align="center">';
+        if (! is_array($staffArray) || count($staffArray)==0) $staffArray = $formcompany->effectif_array(1);
+        print $staffArray[$obj->staff_code];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.email']['checked']))
+    {
+        print "<td>".$obj->email."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.phone']['checked']))
+    {
+        print "<td>".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid)."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.fax']['checked']))
+    {
+        print "<td>".dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid)."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.url']['checked']))
+    {
+        print "<td>".$obj->url."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.siren']['checked']))
+    {
+        print "<td>".$obj->idprof1."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.siret']['checked']))
+    {
+        print "<td>".$obj->idprof2."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.ape']['checked']))
+    {
+        print "<td>".$obj->idprof3."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.idprof4']['checked']))
+    {
+        print "<td>".$obj->idprof4."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.idprof5']['checked']))
+    {
+        print "<td>".$obj->idprof5."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.idprof6']['checked']))
+    {
+        print "<td>".$obj->idprof6."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.tva_intra']['checked']))
+    {
+        print "<td>".$obj->tva_intra."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Type
+    if (! empty($arrayfields['customerorsupplier']['checked']))
+    {
+        print '<td align="center">';
+        $s='';
+        if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+        {
+                $companystatic->name=$langs->trans("Customer");
+                $companystatic->name_alias='';
+            $s.=$companystatic->getNomUrl(0,'customer',0,1);
+        }
+        if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+        {
+            if ($s) $s.=" / ";
+            $companystatic->name=$langs->trans("Prospect");
+                $companystatic->name_alias='';
+            $s.=$companystatic->getNomUrl(0,'prospect',0,1);
+        }
+        if ((! empty($conf->fournisseur->enabled) || ! empty($conf->supplier_proposal->enabled)) && $obj->fournisseur)
+        {
+            if ($s) $s.=" / ";
+            $companystatic->name=$langs->trans("Supplier");
+                $companystatic->name_alias='';
+            $s.=$companystatic->getNomUrl(0,'supplier',0,1);
+        }
+        print $s;
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+
+    if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
+    {
+        // Prospect level
+        print '<td align="center">';
+        print $companystatic->getLibProspLevel();
+        print "</td>";
+        if (! $i) $totalarray['nbfield']++;
+    }
+
+    if (! empty($arrayfields['s.fk_stcomm']['checked']))
+    {
+        // Prospect status
+        print '<td align="center" class="nowrap"><div class="nowrap">';
+        print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
+        print '</div> - <div class="inline-block">';
+        foreach($prospectstatic->cacheprospectstatus as $key => $val)
+        {
+            $titlealt='default';
+            if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
+            if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
+        }
+        print '</div></div></td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['s.datec']['checked']))
+    {
+        print '<td align="center" class="nowrap">';
+        print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Date modification
+    if (! empty($arrayfields['s.tms']['checked']))
+    {
+        print '<td align="center" class="nowrap">';
+        print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Status
+    if (! empty($arrayfields['s.status']['checked']))
+    {
+        print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.import_key']['checked']))
+    {
+        print '<td class="tdoverflowmax100">';
+        print $obj->import_key;
+        print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print '</tr>'."\n";
+    $i++;
 }
 
 $db->free($resql);

dolibarr/htdocs/main.inc.php

Indentation +1481 added lines, -1481 removed lines

@@ -38,34 +38,34 @@ 
 $micro_start_time = 0;
 if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 {
-	list($usec, $sec) = explode(" ", microtime());
-	$micro_start_time=((float) $usec + (float) $sec);
-	// Add Xdebug code coverage
-	//define('XDEBUGCOVERAGE',1);
-	if (defined('XDEBUGCOVERAGE')) {
-		xdebug_start_code_coverage();
-	}
+    list($usec, $sec) = explode(" ", microtime());
+    $micro_start_time=((float) $usec + (float) $sec);
+    // Add Xdebug code coverage
+    //define('XDEBUGCOVERAGE',1);
+    if (defined('XDEBUGCOVERAGE')) {
+        xdebug_start_code_coverage();
+    }
 }
 
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
-	if (get_magic_quotes_gpc())
-	{
-		// Forcing parameter setting magic_quotes_gpc and cleaning parameters
-		// (Otherwise he would have for each position, condition
-		// Reading stripslashes variable according to state get_magic_quotes_gpc).
-		// Off mode recommended (just do $db->escape for insert / update).
-		function stripslashes_deep($value)
-		{
-			return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
-		}
-		$_GET     = array_map('stripslashes_deep', $_GET);
-		$_POST    = array_map('stripslashes_deep', $_POST);
-		$_FILES   = array_map('stripslashes_deep', $_FILES);
-		//$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
-		@set_magic_quotes_runtime(0);
-	}
+    if (get_magic_quotes_gpc())
+    {
+        // Forcing parameter setting magic_quotes_gpc and cleaning parameters
+        // (Otherwise he would have for each position, condition
+        // Reading stripslashes variable according to state get_magic_quotes_gpc).
+        // Off mode recommended (just do $db->escape for insert / update).
+        function stripslashes_deep($value)
+        {
+            return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
+        }
+        $_GET     = array_map('stripslashes_deep', $_GET);
+        $_POST    = array_map('stripslashes_deep', $_POST);
+        $_FILES   = array_map('stripslashes_deep', $_FILES);
+        //$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
+        @set_magic_quotes_runtime(0);
+    }
 }
 
 // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -93,58 +93,58 @@ 
  */
 function testSqlAndScriptInject($val, $type)
 {
-	$inj = 0;
-	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
-	if ($type == 1 || $type == 3)
-	{
-		$inj += preg_match('/delete\s+from/i',	 $val);
-		$inj += preg_match('/create\s+table/i',	 $val);
-		$inj += preg_match('/insert\s+into/i', 	 $val);
-		$inj += preg_match('/select\s+from/i', 	 $val);
-		$inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-		$inj += preg_match('/user\s*\(/i',  $val);						// avoid to use function user() that return current database login
-		$inj += preg_match('/information_schema/i',  $val);				// avoid to use request that read information_schema database
-	}
-	if ($type == 3)
-	{
-		$inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i',	 $val);
-	}
-	if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
-	{
-		$inj += preg_match('/updatexml\(/i', 	 $val);
-		$inj += preg_match('/update.+set.+=/i',  $val);
-		$inj += preg_match('/union.+select/i', 	 $val);
-		$inj += preg_match('/(\.\.%2f)+/i',		 $val);
-	}
-	// For XSS Injection done by adding javascript with script
-	// This is all cases a browser consider text is javascript:
-	// When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
-	// All examples on page: http://ha.ckers.org/xss.html#XSScalc
-	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-	$inj += preg_match('/<script/i', $val);
-	$inj += preg_match('/<iframe/i', $val);
-	$inj += preg_match('/<audio/i', $val);
-	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
-	$inj += preg_match('/base[\s]+href/si', $val);
-	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-	$inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-	$inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-	$inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
-	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-	//if ($type == 1)
-	//{
-		$inj += preg_match('/javascript:/i', $val);
-		$inj += preg_match('/vbscript:/i', $val);
-	//}
-	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
-	return $inj;
+    $inj = 0;
+    // For SQL Injection (only GET are used to be included into bad escaped SQL requests)
+    if ($type == 1 || $type == 3)
+    {
+        $inj += preg_match('/delete\s+from/i',	 $val);
+        $inj += preg_match('/create\s+table/i',	 $val);
+        $inj += preg_match('/insert\s+into/i', 	 $val);
+        $inj += preg_match('/select\s+from/i', 	 $val);
+        $inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
+        $inj += preg_match('/user\s*\(/i',  $val);						// avoid to use function user() that return current database login
+        $inj += preg_match('/information_schema/i',  $val);				// avoid to use request that read information_schema database
+    }
+    if ($type == 3)
+    {
+        $inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i',	 $val);
+    }
+    if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
+    {
+        $inj += preg_match('/updatexml\(/i', 	 $val);
+        $inj += preg_match('/update.+set.+=/i',  $val);
+        $inj += preg_match('/union.+select/i', 	 $val);
+        $inj += preg_match('/(\.\.%2f)+/i',		 $val);
+    }
+    // For XSS Injection done by adding javascript with script
+    // This is all cases a browser consider text is javascript:
+    // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
+    // All examples on page: http://ha.ckers.org/xss.html#XSScalc
+    // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
+    $inj += preg_match('/<script/i', $val);
+    $inj += preg_match('/<iframe/i', $val);
+    $inj += preg_match('/<audio/i', $val);
+    $inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
+    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+    $inj += preg_match('/base[\s]+href/si', $val);
+    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+    $inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
+    $inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
+    $inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+    //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
+    $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+    //if ($type == 1)
+    //{
+        $inj += preg_match('/javascript:/i', $val);
+        $inj += preg_match('/vbscript:/i', $val);
+    //}
+    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
+    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
+    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+    return $inj;
 }
 
 /**
@@ -156,58 +156,58 @@ 
  */
 function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 {
-	if (is_array($var))
-	{
-		foreach ($var as $key => $value)	// Warning, $key may also be used for attacks
-		{
-			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
-			{
-				//$var[$key] = $value;	// This is useless
-			}
-			else
-			{
-				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
-				exit;
-			}
-		}
-		return true;
-	}
-	else
-	{
-		return (testSqlAndScriptInject($var, $type) <= 0);
-	}
+    if (is_array($var))
+    {
+        foreach ($var as $key => $value)	// Warning, $key may also be used for attacks
+        {
+            if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
+            {
+                //$var[$key] = $value;	// This is useless
+            }
+            else
+            {
+                print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
+                exit;
+            }
+        }
+        return true;
+    }
+    else
+    {
+        return (testSqlAndScriptInject($var, $type) <= 0);
+    }
 }
 
 
 // Check consistency of NOREQUIREXXX DEFINES
 if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU'))
 {
-	print 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not set them';
-	exit;
+    print 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not set them';
+    exit;
 }
 
 // Sanity check on URL
 if (! empty($_SERVER["PHP_SELF"]))
 {
-	$morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
+    $morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
 }
 // Sanity check on GET parameters
 if (! defined('NOSCANGETFORINJECTION') && ! empty($_SERVER["QUERY_STRING"]))
 {
-	$morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
+    $morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
 }
 // Sanity check on POST
 if (! defined('NOSCANPOSTFORINJECTION'))
 {
-	analyseVarsForSqlAndScriptsInjection($_POST,0);
+    analyseVarsForSqlAndScriptsInjection($_POST,0);
 }
 
 // This is to make Dolibarr working with Plesk
 if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
 {
-	set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+    set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
 }
 
 // Include the conf.php and functions.lib.php
@@ -218,20 +218,20 @@ 
 // DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
 if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
-	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
-	$tmplist=explode(',',$tmpautoset[1]);
-	$cookiearrayvalue=array();
-	foreach ($tmplist as $tmpkey)
-	{
-		$postkey=$tmpautoset[0].'_'.$tmpkey;
-		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
-	}
-	$cookiename=$tmpautoset[0];
-	$cookievalue=json_encode($cookiearrayvalue);
-	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
-	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
+    $tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
+    $tmplist=explode(',',$tmpautoset[1]);
+    $cookiearrayvalue=array();
+    foreach ($tmplist as $tmpkey)
+    {
+        $postkey=$tmpautoset[0].'_'.$tmpkey;
+        //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
+        if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+    }
+    $cookiename=$tmpautoset[0];
+    $cookievalue=json_encode($cookiearrayvalue);
+    //var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
+    setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
+    if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
 }
 
 
@@ -248,8 +248,8 @@ 
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (! defined('NOSESSION'))
 {
-	session_start();
-	/*if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
+    session_start();
+    /*if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
 	{
 		foreach ($_SESSION as $key=>$value)
 		{
@@ -267,72 +267,72 @@ 
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-	$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-	$conf->browser->name=$tmp['browsername'];
-	$conf->browser->os=$tmp['browseros'];
-	$conf->browser->version=$tmp['browserversion'];
-	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
-	//var_dump($conf->browser);
-
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+    $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+    $conf->browser->name=$tmp['browsername'];
+    $conf->browser->os=$tmp['browseros'];
+    $conf->browser->version=$tmp['browserversion'];
+    $conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
+    //var_dump($conf->browser);
+
+    if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
+    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
 if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-	$newurl='';
-	if (is_numeric($conf->file->main_force_https))
-	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
-		{
-			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
-			{
-				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
-			}
-		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
-		{
-			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
-		}
-	}
-	else
-	{
-		// Check HTTPS environment variable (Apache/mod_ssl only)
-		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
-	}
-	// Start redirect
-	if ($newurl)
-	{
-		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
-		header("Location: ".$newurl);
-		exit;
-	}
-	else
-	{
-		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
-	}
+    $newurl='';
+    if (is_numeric($conf->file->main_force_https))
+    {
+        if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+        {
+            if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
+            {
+                $newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
+            }
+        }
+        else	// Check HTTPS environment variable (Apache/mod_ssl only)
+        {
+            $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+        }
+    }
+    else
+    {
+        // Check HTTPS environment variable (Apache/mod_ssl only)
+        $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+    }
+    // Start redirect
+    if ($newurl)
+    {
+        dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
+        header("Location: ".$newurl);
+        exit;
+    }
+    else
+    {
+        dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
+    }
 }
 
 if (! defined('NOLOGIN') && ! defined('NOIPCHECK') && ! empty($dolibarr_main_restrict_ip))
 {
-	$listofip=explode(',', $dolibarr_main_restrict_ip);
-	$found = false;
-	foreach($listofip as $ip)
-	{
-		$ip=trim($ip);
-		if ($ip == $_SERVER['REMOTE_ADDR'])
-		{
-			$found = true;
-			break;
-		}
-	}
-	if (! $found)
-	{
-		print 'Access refused by IP protection';
-		exit;
-	}
+    $listofip=explode(',', $dolibarr_main_restrict_ip);
+    $found = false;
+    foreach($listofip as $ip)
+    {
+        $ip=trim($ip);
+        if ($ip == $_SERVER['REMOTE_ADDR'])
+        {
+            $found = true;
+            break;
+        }
+    }
+    if (! $found)
+    {
+        print 'Access refused by IP protection';
+        exit;
+    }
 }
 
 // Loading of additional presentation includes
@@ -342,75 +342,75 @@ 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
 {
-	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
-	header("Location: ".DOL_URL_ROOT."/install/index.php");
-	exit;
+    dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
+    header("Location: ".DOL_URL_ROOT."/install/index.php");
+    exit;
 }
 // If an upgrade process is required, we call the install page.
 if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
 || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
 {
-	$versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
-	require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
-	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
-	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
-	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
-	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-	{
-		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
-		header("Location: ".DOL_URL_ROOT."/install/index.php");
-		exit;
-	}
+    $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
+    require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
+    $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
+    $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
+    $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
+    if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
+    {
+        dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+        header("Location: ".DOL_URL_ROOT."/install/index.php");
+        exit;
+    }
 }
 
 // Creation of a token against CSRF vulnerabilities
 if (! defined('NOTOKENRENEWAL'))
 {
-	// roulement des jetons car cree a chaque appel
-	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+    // roulement des jetons car cree a chaque appel
+    if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
-	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-	$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
-	$_SESSION['newtoken'] = $token;
+    // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
+    $token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
+    $_SESSION['newtoken'] = $token;
 }
 if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
-	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
+    || defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
 {
-	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
-	{
-		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
-		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
-		die;
-	}
-	if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
-	{
-		if (GETPOST('token', 'alpha') != $_SESSION['token'])
-		{
-			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
-			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
-			unset($_POST);
-		}
-	}
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
+    {
+        print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+        print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
+        die;
+    }
+    if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+    {
+        if (GETPOST('token', 'alpha') != $_SESSION['token'])
+        {
+            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+            //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
+            unset($_POST);
+        }
+    }
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
 if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
 if (! empty($_SESSION["disablemodules"]))
 {
-	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
-	foreach($disabled_modules as $module)
-	{
-		if ($module)
-		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();
-			$conf->$module->enabled=false;
-			if ($module == 'fournisseur')		// Special case
-			{
-				$conf->supplier_order->enabled=0;
-				$conf->supplier_invoice->enabled=0;
-			}
-		}
-	}
+    $disabled_modules=explode(',',$_SESSION["disablemodules"]);
+    foreach($disabled_modules as $module)
+    {
+        if ($module)
+        {
+            if (empty($conf->$module)) $conf->$module=new stdClass();
+            $conf->$module->enabled=false;
+            if ($module == 'fournisseur')		// Special case
+            {
+                $conf->supplier_order->enabled=0;
+                $conf->supplier_invoice->enabled=0;
+            }
+        }
+    }
 }
 
 /*
@@ -419,481 +419,481 @@ 
 $login='';
 if (! defined('NOLOGIN'))
 {
-	// $authmode lists the different means of identification to be tested in order of preference.
-	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
+    // $authmode lists the different means of identification to be tested in order of preference.
+    // Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
 
-	if (defined('MAIN_AUTHENTICATION_MODE'))
-	{
-		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
-	}
-	else
-	{
-		// Authentication mode
-		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
-		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-	}
-	// Set authmode
-	$authmode=explode(',',$dolibarr_main_authentication);
-
-	// No authentication mode
-	if (! count($authmode))
-	{
-		$langs->load('main');
-		dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
-		exit;
-	}
-
-	// If login request was already post, we retrieve login from the session
-	// Call module if not realized that his request.
-	// At the end of this phase, the variable $login is defined.
-	$resultFetchUser='';
-	$test=true;
-	if (! isset($_SESSION["dol_login"]))
-	{
-		// It is not already authenticated and it requests the login / password
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-
-		$dol_dst_observed=GETPOST("dst_observed",'int',3);
-		$dol_dst_first=GETPOST("dst_first",'int',3);
-		$dol_dst_second=GETPOST("dst_second",'int',3);
-		$dol_screenwidth=GETPOST("screenwidth",'int',3);
-		$dol_screenheight=GETPOST("screenheight",'int',3);
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
-		$dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
-		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
-
-		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
-		{
-			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
-			{
-				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-				$url='';
-				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-				$url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-				$url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-				$url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-				$url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
-				header("Location: ".$url);
-				exit;
-			}
-		}
+    if (defined('MAIN_AUTHENTICATION_MODE'))
+    {
+        $dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
+    }
+    else
+    {
+        // Authentication mode
+        if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+        // Authentication mode: forceuser
+        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+    }
+    // Set authmode
+    $authmode=explode(',',$dolibarr_main_authentication);
+
+    // No authentication mode
+    if (! count($authmode))
+    {
+        $langs->load('main');
+        dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
+        exit;
+    }
 
-		// Verification security graphic code
-		if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-		{
-			$sessionkey = 'dol_antispam_value';
-			$ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
-
-			// Check code
-			if (! $ok)
-			{
-				dol_syslog('Bad value for code, connexion refused');
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-				$test=false;
-
-				// Call trigger for the "security events" log
-				$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
-				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++;
-				}
-				// End Call of triggers
-
-				// Hooks on failed login
-				$action='';
-				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
-
-				// Note: exit is done later
-			}
-		}
+    // If login request was already post, we retrieve login from the session
+    // Call module if not realized that his request.
+    // At the end of this phase, the variable $login is defined.
+    $resultFetchUser='';
+    $test=true;
+    if (! isset($_SESSION["dol_login"]))
+    {
+        // It is not already authenticated and it requests the login / password
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+
+        $dol_dst_observed=GETPOST("dst_observed",'int',3);
+        $dol_dst_first=GETPOST("dst_first",'int',3);
+        $dol_dst_second=GETPOST("dst_second",'int',3);
+        $dol_screenwidth=GETPOST("screenwidth",'int',3);
+        $dol_screenheight=GETPOST("screenheight",'int',3);
+        $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
+        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
+        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
+        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
+        $dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
+        //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
+
+        // If in demo mode, we check we go to home page through the public/demo/index.php page
+        if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+        {
+            if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
+            {
+                dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+                $url='';
+                $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
+                $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
+                $url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
+                $url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
+                $url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
+                $url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+                header("Location: ".$url);
+                exit;
+            }
+        }
 
-		$allowedmethodtopostusername = 2;
-		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
-		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",$allowedmethodtopostusername));
-		$passwordtotest	= GETPOST('password','none',$allowedmethodtopostusername);
-		$entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+        // Verification security graphic code
+        if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+        {
+            $sessionkey = 'dol_antispam_value';
+            $ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
-		// Define if we received data to test the login.
-		$goontestloop=false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-		if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+            // Check code
+            if (! $ok)
+            {
+                dol_syslog('Bad value for code, connexion refused');
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
+                $test=false;
+
+                // Call trigger for the "security events" log
+                $user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+                // Call of triggers
+                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                $interface=new Interfaces($db);
+                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+                if ($result < 0) {
+                    $error++;
+                }
+                // End Call of triggers
 
-		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-			$langs=new Translate("",$conf);
-			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-			if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
-			$langs->setDefaultLang($langcode);
-		}
+                // Hooks on failed login
+                $action='';
+                $hookmanager->initHooks(array('login'));
+                $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+                $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
 
-		// Validation of login/pass/entity
-		// If ok, the variable login will be returned
-		// If error, we will put error message in session under the name dol_loginmesg
-		if ($test && $goontestloop)
-		{
-			$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
-			if ($login)
-			{
-				$dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
-				$dol_tz=$_POST["tz"];
-				$dol_tz_string=$_POST["tz_string"];
-				$dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
-				$dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
-				$dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
-				$dol_dst=0;
-				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-					$datenow=dol_now();
-					$datefirst=dol_stringtotime($_POST["dst_first"]);
-					$datesecond=dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
-				}
-				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
-			}
-
-			if (! $login)
-			{
-				dol_syslog('Bad password, connexion refused',LOG_DEBUG);
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				// Bad password. No authmode has found a good password.
-				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-
-				// Call trigger for the "security events" log
-				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
-				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
-				if ($result < 0) {
-					$error++;
-				}
-				// End Call of triggers
-
-				// Hooks on failed login
-				$action='';
-				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
-
-				// Note: exit is done in next chapter
-			}
-		}
+                // Note: exit is done later
+            }
+        }
 
-		// End test login / passwords
-		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
-		{
-			// No data to test login, so we show the login page
-			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
-			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
-			exit;
-		}
+        $allowedmethodtopostusername = 2;
+        if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        $usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",$allowedmethodtopostusername));
+        $passwordtotest	= GETPOST('password','none',$allowedmethodtopostusername);
+        $entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
-		if ($resultFetchUser <= 0)
-		{
-			dol_syslog('User not found, connexion refused');
-			session_destroy();
-			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
-
-			if ($resultFetchUser == 0)
-			{
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
-
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0)
-			{
-				$_SESSION["dol_loginmesg"]=$user->error;
-
-				$user->trigger_mesg=$user->error;
-			}
-
-			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++;
-			}
-			// End call triggers
-
-			// Hooks on failed login
-			$action='';
-			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
-
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
-			exit;
-		}
-	}
-	else
-	{
-		// We are already into an authenticated session
-		$login=$_SESSION["dol_login"];
-		$entity=$_SESSION["dol_entity"];
-		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
+        // Define if we received data to test the login.
+        $goontestloop=false;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
+        if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
+        if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-		if ($resultFetchUser <= 0)
-		{
-			// Account has been removed after login
-			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
-			session_destroy();
-			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
-
-			if ($resultFetchUser == 0)
-			{
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
-
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0)
-			{
-				$_SESSION["dol_loginmesg"]=$user->error;
-
-				$user->trigger_mesg=$user->error;
-			}
-
-			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++;
-			}
-			// End call triggers
-
-			// Hooks on failed login
-			$action='';
-			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
-
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
-			exit;
-		}
-		else
-		{
-		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-		    $hookmanager->initHooks(array('main'));
-
-		    // Code for search criteria persistence.
-		    if (! empty($_GET['save_lastsearch_values']))    // We must use $_GET here
-		    {
-			    $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
-			    // Clean $relativepathstring
-   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-			    //var_dump($relativepathstring);
-
-			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-			    if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
-				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
-			    }
-			    if (! empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
-			    }
-			    if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
-			    {
-			    	$_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
-			    }
-			    if (! empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
-			    {
-			    	$_SESSION['lastsearch_limit_'.$relativepathstring]=$_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
-			    }
-		    }
-
-		    $action = '';
-		    $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
-		    if ($reshook < 0) {
-			    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		    }
-		}
-	}
+        if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+            $langs=new Translate("",$conf);
+            $langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+            if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+            $langs->setDefaultLang($langcode);
+        }
 
-	// Is it a new session that has started ?
-	// If we are here, this means authentication was successfull.
-	if (! isset($_SESSION["dol_login"]))
-	{
-		// New session for this login has started.
-		$error=0;
-
-		// Store value into session (values always stored)
-		$_SESSION["dol_login"]=$user->login;
-		$_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
-		$_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
-		$_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
-		$_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
-		$_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
-		$_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
-		$_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
-		$_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
-		$_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
-		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$_SESSION["dol_entity"]=$conf->entity;
-		// Store value into session (values stored only if defined)
-		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
-
-		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
-
-		$db->begin();
-
-		$user->update_last_login_date();
-
-		$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
-
-		// Call triggers for the "security events" log
-		$user->trigger_mesg = $loginfo;
-		// Call triggers
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($db);
-		$result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
-		if ($result < 0) {
-			$error++;
-		}
-		// End call triggers
+        // Validation of login/pass/entity
+        // If ok, the variable login will be returned
+        // If error, we will put error message in session under the name dol_loginmesg
+        if ($test && $goontestloop)
+        {
+            $login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
+            if ($login)
+            {
+                $dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
+                $dol_tz=$_POST["tz"];
+                $dol_tz_string=$_POST["tz_string"];
+                $dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
+                $dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
+                $dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
+                $dol_dst=0;
+                if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+                    $datenow=dol_now();
+                    $datefirst=dol_stringtotime($_POST["dst_first"]);
+                    $datesecond=dol_stringtotime($_POST["dst_second"]);
+                    if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+                }
+                //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
+            }
 
-		// Hooks on successfull login
-		$action='';
-		$hookmanager->initHooks(array('login'));
-		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
-		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0) $error++;
+            if (! $login)
+            {
+                dol_syslog('Bad password, connexion refused',LOG_DEBUG);
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                // Bad password. No authmode has found a good password.
+                // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
+                if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+
+                // Call trigger for the "security events" log
+                $user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+                // Call of triggers
+                include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+                $interface=new Interfaces($db);
+                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+                if ($result < 0) {
+                    $error++;
+                }
+                // End Call of triggers
 
-		if ($error)
-		{
-			$db->rollback();
-			session_destroy();
-			dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
-			exit;
-		}
-		else
-		{
-			$db->commit();
-		}
+                // Hooks on failed login
+                $action='';
+                $hookmanager->initHooks(array('login'));
+                $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+                $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
 
-		// Change landing page if defined.
-		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-		if (! empty($landingpage))    // Example: /index.php
-		{
-			$newpath=dol_buildpath($landingpage, 1);
-			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
-			{
-				header('Location: '.$newpath);
-				exit;
-			}
-		}
-	}
+                // Note: exit is done in next chapter
+            }
+        }
+
+        // End test login / passwords
+        if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+        {
+            // No data to test login, so we show the login page
+            dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
+            if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
+            else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+            exit;
+        }
 
+        $resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+        if ($resultFetchUser <= 0)
+        {
+            dol_syslog('User not found, connexion refused');
+            session_destroy();
+            session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+            session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
-	// If user admin, we force the rights-based modules
-	if ($user->admin)
-	{
-		$user->rights->user->user->lire=1;
-		$user->rights->user->user->creer=1;
-		$user->rights->user->user->password=1;
-		$user->rights->user->user->supprimer=1;
-		$user->rights->user->self->creer=1;
-		$user->rights->user->self->password=1;
-	}
-
-	/*
+            if ($resultFetchUser == 0)
+            {
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+            }
+            if ($resultFetchUser < 0)
+            {
+                $_SESSION["dol_loginmesg"]=$user->error;
+
+                $user->trigger_mesg=$user->error;
+            }
+
+            // Call triggers for the "security events" log
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($db);
+            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+            if ($result < 0) {
+                $error++;
+            }
+            // End call triggers
+
+            // Hooks on failed login
+            $action='';
+            $hookmanager->initHooks(array('login'));
+            $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+            $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0) $error++;
+
+            $paramsurl=array();
+            if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+            if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+            if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+            exit;
+        }
+    }
+    else
+    {
+        // We are already into an authenticated session
+        $login=$_SESSION["dol_login"];
+        $entity=$_SESSION["dol_entity"];
+        dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
+
+        $resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+        if ($resultFetchUser <= 0)
+        {
+            // Account has been removed after login
+            dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
+            session_destroy();
+            session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+            session_start();    // Fixing the bug of register_globals here is useless since session is empty
+
+            if ($resultFetchUser == 0)
+            {
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+            }
+            if ($resultFetchUser < 0)
+            {
+                $_SESSION["dol_loginmesg"]=$user->error;
+
+                $user->trigger_mesg=$user->error;
+            }
+
+            // Call triggers for the "security events" log
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($db);
+            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+            if ($result < 0) {
+                $error++;
+            }
+            // End call triggers
+
+            // Hooks on failed login
+            $action='';
+            $hookmanager->initHooks(array('login'));
+            $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+            $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0) $error++;
+
+            $paramsurl=array();
+            if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+            if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+            if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+            exit;
+        }
+        else
+        {
+            // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+            $hookmanager->initHooks(array('main'));
+
+            // Code for search criteria persistence.
+            if (! empty($_GET['save_lastsearch_values']))    // We must use $_GET here
+            {
+                $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+                $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+                // Clean $relativepathstring
+                    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+                $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+                $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+                //var_dump($relativepathstring);
+
+                // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
+                if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+                {
+                    $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+                }
+                if (! empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
+                {
+                    $_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+                }
+                if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
+                {
+                    $_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+                }
+                if (! empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
+                {
+                    $_SESSION['lastsearch_limit_'.$relativepathstring]=$_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+                }
+            }
+
+            $action = '';
+            $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
+            if ($reshook < 0) {
+                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+            }
+        }
+    }
+
+    // Is it a new session that has started ?
+    // If we are here, this means authentication was successfull.
+    if (! isset($_SESSION["dol_login"]))
+    {
+        // New session for this login has started.
+        $error=0;
+
+        // Store value into session (values always stored)
+        $_SESSION["dol_login"]=$user->login;
+        $_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
+        $_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
+        $_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
+        $_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
+        $_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
+        $_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
+        $_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
+        $_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
+        $_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
+        $_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
+        $_SESSION["dol_entity"]=$conf->entity;
+        // Store value into session (values stored only if defined)
+        if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
+        if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
+        if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
+        if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
+        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+
+        dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
+
+        $db->begin();
+
+        $user->update_last_login_date();
+
+        $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+
+        // Call triggers for the "security events" log
+        $user->trigger_mesg = $loginfo;
+        // Call triggers
+        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+        $interface=new Interfaces($db);
+        $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+        if ($result < 0) {
+            $error++;
+        }
+        // End call triggers
+
+        // Hooks on successfull login
+        $action='';
+        $hookmanager->initHooks(array('login'));
+        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+        $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+        if ($reshook < 0) $error++;
+
+        if ($error)
+        {
+            $db->rollback();
+            session_destroy();
+            dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
+            exit;
+        }
+        else
+        {
+            $db->commit();
+        }
+
+        // Change landing page if defined.
+        $landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
+        if (! empty($landingpage))    // Example: /index.php
+        {
+            $newpath=dol_buildpath($landingpage, 1);
+            if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
+            {
+                header('Location: '.$newpath);
+                exit;
+            }
+        }
+    }
+
+
+    // If user admin, we force the rights-based modules
+    if ($user->admin)
+    {
+        $user->rights->user->user->lire=1;
+        $user->rights->user->user->creer=1;
+        $user->rights->user->user->password=1;
+        $user->rights->user->user->supprimer=1;
+        $user->rights->user->self->creer=1;
+        $user->rights->user->self->password=1;
+    }
+
+    /*
      * Overwrite some configs globals (try to avoid this and have code to use instead $user->conf->xxx)
      */
 
-	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+    // Set liste_limit
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
 
-	// Replace conf->css by personalized value if theme not forced
-	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
-	{
-		$conf->theme=$user->conf->MAIN_THEME;
-		$conf->css  = "/theme/".$conf->theme."/style.css.php";
-	}
+    // Replace conf->css by personalized value if theme not forced
+    if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
+    {
+        $conf->theme=$user->conf->MAIN_THEME;
+        $conf->css  = "/theme/".$conf->theme."/style.css.php";
+    }
 }
 
 // Case forcing style from url
 if (GETPOST('theme','alpha'))
 {
-	$conf->theme=GETPOST('theme','alpha',1);
-	$conf->css  = "/theme/".$conf->theme."/style.css.php";
+    $conf->theme=GETPOST('theme','alpha',1);
+    $conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
 
 // Set javascript option
 if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
 {
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
-	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
-	}
+    if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+    {
+        $conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+    }
 }
 else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
 elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
+    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // Set terminal output option according to conf->browser.
@@ -904,56 +904,56 @@ 
 if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
 if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
-	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
-	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+    || (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+    || (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 )
 {
-	$conf->dol_optimize_smallscreen=1;
+    $conf->dol_optimize_smallscreen=1;
 }
 // If we force to use jmobile, then we reenable javascript
 if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
 // Replace themes bugged with jmobile with eldy
 if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
 {
-	$conf->theme='eldy';
-	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
+    $conf->theme='eldy';
+    $conf->css  =  "/theme/".$conf->theme."/style.css.php";
 }
 
 if (! defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
-	{
-		// If user has chosen its own language
-		if (! empty($user->conf->MAIN_LANG_DEFAULT))
-		{
-			// If different than current language
-			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
-			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
-			{
-				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
-			}
-		}
-	}
+    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+    {
+        // If user has chosen its own language
+        if (! empty($user->conf->MAIN_LANG_DEFAULT))
+        {
+            // If different than current language
+            //print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
+            if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
+            {
+                $langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+            }
+        }
+    }
 }
 
 if (! defined('NOLOGIN'))
 {
-	// If the login is not recovered, it is identified with an account that does not exist.
-	// Hacking attempt?
-	if (! $user->login) accessforbidden();
+    // If the login is not recovered, it is identified with an account that does not exist.
+    // Hacking attempt?
+    if (! $user->login) accessforbidden();
+
+    // Check if user is active
+    if ($user->statut < 1)
+    {
+        // If not active, we refuse the user
+        $langs->load("other");
+        dol_syslog("Authentification ko as login is disabled");
+        accessforbidden($langs->trans("ErrorLoginDisabled"));
+        exit;
+    }
 
-	// Check if user is active
-	if ($user->statut < 1)
-	{
-		// If not active, we refuse the user
-		$langs->load("other");
-		dol_syslog("Authentification ko as login is disabled");
-		accessforbidden($langs->trans("ErrorLoginDisabled"));
-		exit;
-	}
-
-	// Load permissions
-	$user->getrights();
+    // Load permissions
+    $user->getrights();
 }
 
 
@@ -964,8 +964,8 @@ 
 // Load main languages files
 if (! defined('NOREQUIRETRAN'))
 {
-	// Load translation files required by page
-	$langs->loadLangs(array('main', 'dict'));
+    // Load translation files required by page
+    $langs->loadLangs(array('main', 'dict'));
 }
 
 // Define some constants used for style of arrays
@@ -982,27 +982,27 @@ 
 // Constants used to defined number of lines in textarea
 if (empty($conf->browser->firefox))
 {
-	define('ROWS_1',1);
-	define('ROWS_2',2);
-	define('ROWS_3',3);
-	define('ROWS_4',4);
-	define('ROWS_5',5);
-	define('ROWS_6',6);
-	define('ROWS_7',7);
-	define('ROWS_8',8);
-	define('ROWS_9',9);
+    define('ROWS_1',1);
+    define('ROWS_2',2);
+    define('ROWS_3',3);
+    define('ROWS_4',4);
+    define('ROWS_5',5);
+    define('ROWS_6',6);
+    define('ROWS_7',7);
+    define('ROWS_8',8);
+    define('ROWS_9',9);
 }
 else
 {
-	define('ROWS_1',0);
-	define('ROWS_2',1);
-	define('ROWS_3',2);
-	define('ROWS_4',3);
-	define('ROWS_5',4);
-	define('ROWS_6',5);
-	define('ROWS_7',6);
-	define('ROWS_8',7);
-	define('ROWS_9',8);
+    define('ROWS_1',0);
+    define('ROWS_2',1);
+    define('ROWS_3',2);
+    define('ROWS_4',3);
+    define('ROWS_5',4);
+    define('ROWS_6',5);
+    define('ROWS_7',6);
+    define('ROWS_8',7);
+    define('ROWS_9',8);
 }
 
 $heightforframes=50;
@@ -1010,36 +1010,36 @@ 
 // Init menu manager
 if (! defined('NOREQUIREMENU'))
 {
-	if (empty($user->societe_id))    // If internal user or not defined
-	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
-	}
-	else                        // If external user
-	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
-	}
+    if (empty($user->societe_id))    // If internal user or not defined
+    {
+        $conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+    }
+    else                        // If external user
+    {
+        $conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+    }
 
-	// Load the menu manager (only if not already done)
-	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
-	if (! class_exists('MenuManager'))
-	{
-		$menufound=0;
-		$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-		foreach($dirmenus as $dirmenu)
-		{
-			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-			if (class_exists('MenuManager')) break;
-		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
-		{
-			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-			$file_menu='eldy_menu.php';
-			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
-		}
-	}
-	$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
-	$menumanager->loadMenu();
+    // Load the menu manager (only if not already done)
+    $file_menu=$conf->standard_menu;
+    if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
+    if (! class_exists('MenuManager'))
+    {
+        $menufound=0;
+        $dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
+        foreach($dirmenus as $dirmenu)
+        {
+            $menufound=dol_include_once($dirmenu."standard/".$file_menu);
+            if (class_exists('MenuManager')) break;
+        }
+        if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+        {
+            dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+            $file_menu='eldy_menu.php';
+            include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
+        }
+    }
+    $menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+    $menumanager->loadMenu();
 }
 
 
@@ -1048,52 +1048,52 @@ 
 
 if (! function_exists("llxHeader"))
 {
-	/**
-	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
-	 *
-	 * @param 	string 	$head				Optionnal head lines
-	 * @param 	string 	$title				HTML title
-	 * @param	string	$help_url			Url links to help page
-	 * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
-	 *                                  	For other external page: http://server/url
-	 * @param	string	$target				Target to use on links
-	 * @param 	int    	$disablejs			More content into html header
-	 * @param 	int    	$disablehead		More content into html header
-	 * @param 	array  	$arrayofjs			Array of complementary js files
-	 * @param 	array  	$arrayofcss			Array of complementary css files
-	 * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
-	 * @param   string  $morecssonbody      More CSS on body tag.
-	 * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
-	 * @return	void
-	 */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='', $replacemainareaby='')
-	{
-		global $conf;
+    /**
+     *	Show HTML header HTML + BODY + Top menu + left menu + DIV
+     *
+     * @param 	string 	$head				Optionnal head lines
+     * @param 	string 	$title				HTML title
+     * @param	string	$help_url			Url links to help page
+     * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+     *                                  	For other external page: http://server/url
+     * @param	string	$target				Target to use on links
+     * @param 	int    	$disablejs			More content into html header
+     * @param 	int    	$disablehead		More content into html header
+     * @param 	array  	$arrayofjs			Array of complementary js files
+     * @param 	array  	$arrayofcss			Array of complementary css files
+     * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+     * @param   string  $morecssonbody      More CSS on body tag.
+     * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
+     * @return	void
+     */
+    function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='', $replacemainareaby='')
+    {
+        global $conf;
 
-		// html header
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+        // html header
+        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-		print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
 
-		// top menu and left menu area
-		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int'))
-		{
-			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
-		}
+        // top menu and left menu area
+        if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int'))
+        {
+            top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
+        }
 
-		if (empty($conf->dol_hide_leftmenu))
-		{
-			left_menu('', $help_url, '', '', 1, $title, 1);		// $menumanager is retreived with a global $menumanager inside this function
-		}
+        if (empty($conf->dol_hide_leftmenu))
+        {
+            left_menu('', $help_url, '', '', 1, $title, 1);		// $menumanager is retreived with a global $menumanager inside this function
+        }
 
-		// main area
-		if ($replacemainareaby)
-		{
-			print $replacemainareaby;
-			return;
-		}
-		main_area($title);
-	}
+        // main area
+        if ($replacemainareaby)
+        {
+            print $replacemainareaby;
+            return;
+        }
+        main_area($title);
+    }
 }
 
 
@@ -1106,53 +1106,53 @@ 
  */
 function top_httphead($contenttype='text/html', $forcenocache=0)
 {
-	global $db, $conf, $hookmanager;
-
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-	else header("Content-Type: ".$contenttype);
-	// Security options
-	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-	//header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
-	if (! defined('FORCECSP'))
-	{
-		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
-		//{
-		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
-		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
-		//}
-		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
-		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
-
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
-		$hookmanager->initHooks("main");
-
-		$parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
-		$result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
-		else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
-
-		if (! empty($contentsecuritypolicy))
-		{
-			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
-			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
-			// For example, to restrict everything to one domain, except 'object', ...:
-			// default-src https://cdn.example.net; object-src 'none'
-			// For example, to restrict everything to itself except img that can be on other servers:
-			// default-src 'self'; img-src *;
-			// Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
-			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
-			header("Content-Security-Policy: ".$contentsecuritypolicy);
-		}
-	}
-	elseif (constant('FORCECSP'))
-	{
-		header("Content-Security-Policy: ".constant('FORCECSP'));
-	}
-	if ($forcenocache)
-	{
-		header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
-	}
+    global $db, $conf, $hookmanager;
+
+    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+    else header("Content-Type: ".$contenttype);
+    // Security options
+    header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+    header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+    //header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
+    if (! defined('FORCECSP'))
+    {
+        //if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+        //{
+        //	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+        //	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
+        //}
+        //else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+        $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+
+        if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+        $hookmanager->initHooks("main");
+
+        $parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
+        $result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
+        if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
+        else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
+
+        if (! empty($contentsecuritypolicy))
+        {
+            // For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
+            // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
+            // For example, to restrict everything to one domain, except 'object', ...:
+            // default-src https://cdn.example.net; object-src 'none'
+            // For example, to restrict everything to itself except img that can be on other servers:
+            // default-src 'self'; img-src *;
+            // Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
+            // default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
+            header("Content-Security-Policy: ".$contentsecuritypolicy);
+        }
+    }
+    elseif (constant('FORCECSP'))
+    {
+        header("Content-Security-Policy: ".constant('FORCECSP'));
+    }
+    if ($forcenocache)
+    {
+        header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
+    }
 }
 
 /**
@@ -1171,220 +1171,220 @@ 
  */
 function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $disablejmobile=0, $disablenofollow=0)
 {
-	global $db, $conf, $langs, $user, $hookmanager;
+    global $db, $conf, $langs, $user, $hookmanager;
 
-	top_httphead();
+    top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+    if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
 
-	print '<!doctype html>'."\n";
+    print '<!doctype html>'."\n";
 
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
-	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
-	if (empty($disablehead))
-	{
-		$ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
-
-		print "<head>\n";
-
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
-
-		// Displays meta
-		print '<meta charset="UTF-8">'."\n";
-		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
-		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
-		print '<meta name="author" content="Dolibarr Development Team">'."\n";
-
-		// Favicon
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
-
-		// Auto refresh page
-		if (GETPOST('autorefresh','int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
-
-		// Displays title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-
-		print '<title>';
-		$titletoshow='';
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
-		else if ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
-		else $titletoshow = dol_htmlentities($appli);
-
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
-		$hookmanager->initHooks("main");
-		$parameters=array('title'=>$titletoshow);
-		$result=$hookmanager->executeHooks('setHtmlTitle',$parameters);		// Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
-		else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
-
-		print $titletoshow;
-		print '</title>';
-
-		print "\n";
-
-		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
-
-		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-		$themeparam.=($ext?'&amp;'.$ext:'');
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-		if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-		if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
-
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
-		{
-			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
-			$jquerytheme = 'base';
-			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
-			{
-				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
-			}
-		}
+    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+    else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+    //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
+    if (empty($disablehead))
+    {
+        $ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
-		if (! defined('DISABLE_FONT_AWSOME'))
-		{
-			print '<!-- Includes CSS for font awesome -->'."\n";
-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
-		}
+        print "<head>\n";
 
-		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-		$themepath=dol_buildpath($conf->css,1);
-		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
-		{
-			foreach($conf->modules_parts['theme'] as $reldir)
-			{
-				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
-				{
-					$themepath=dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir=$reldir;
-					break;
-				}
-			}
-		}
+        if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
 
-		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+        // Displays meta
+        print '<meta charset="UTF-8">'."\n";
+        print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
+        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
+        print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
-		// CSS forced by modules (relative url starting with /)
-		if (! empty($conf->modules_parts['css']))
-		{
-			$arraycss=(array) $conf->modules_parts['css'];
-			foreach($arraycss as $modcss => $filescss)
-			{
-				$filescss=(array) $filescss;	// To be sure filecss is an array
-				foreach($filescss as $cssfile)
-				{
-					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
-					// cssfile is a relative path
-					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
-					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
-					print '">'."\n";
-				}
-			}
-		}
-		// CSS forced by page in top_htmlhead call (relative url starting with /)
-		if (is_array($arrayofcss))
-		{
-			foreach($arrayofcss as $cssfile)
-			{
-				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
-				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
-				print '">'."\n";
-			}
-		}
+        // Favicon
+        $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
+        if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+        if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
-		// Output standard javascript links
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
-		{
-			// JQuery. Must be before other includes
-			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
-			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
-			{
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}
-			// Flot
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
-			{
-				if (constant('JS_JQUERY_FLOT'))
-				{
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				}
-				else
-				{
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				}
-			}
-			// jQuery jeditable
-			if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
-			{
-				print '<!-- JS to manage editInPlace feature -->'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript">'."\n";
-				print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
-				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
-				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
-				print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
-				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
-				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
-				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
-				print 'var withInPlace = 300;';		// width in pixel for default string edit
-				print '</script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}
+        // Auto refresh page
+        if (GETPOST('autorefresh','int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
+
+        // Displays title
+        $appli=constant('DOL_APPLICATION_TITLE');
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+
+        print '<title>';
+        $titletoshow='';
+        if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
+        else if ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
+        else $titletoshow = dol_htmlentities($appli);
+
+        if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+        $hookmanager->initHooks("main");
+        $parameters=array('title'=>$titletoshow);
+        $result=$hookmanager->executeHooks('setHtmlTitle',$parameters);		// Note that $action and $object may have been modified by some hooks
+        if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
+        else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
+
+        print $titletoshow;
+        print '</title>';
+
+        print "\n";
+
+        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
+        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+
+        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+        $themeparam.=($ext?'&amp;'.$ext:'');
+        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+        if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+        if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+        if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+        if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+        if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+
+        if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+        {
+            print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
+            $jquerytheme = 'base';
+            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+            if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
+            else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
+            if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+            {
+                $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+                print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+            }
+        }
+
+        if (! defined('DISABLE_FONT_AWSOME'))
+        {
+            print '<!-- Includes CSS for font awesome -->'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+        }
+
+        print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+        // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+        $themepath=dol_buildpath($conf->css,1);
+        $themesubdir='';
+        if (! empty($conf->modules_parts['theme']))	// This slow down
+        {
+            foreach($conf->modules_parts['theme'] as $reldir)
+            {
+                if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+                {
+                    $themepath=dol_buildpath($reldir.$conf->css, 1);
+                    $themesubdir=$reldir;
+                    break;
+                }
+            }
+        }
+
+        //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+        print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
+        if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+
+        // CSS forced by modules (relative url starting with /)
+        if (! empty($conf->modules_parts['css']))
+        {
+            $arraycss=(array) $conf->modules_parts['css'];
+            foreach($arraycss as $modcss => $filescss)
+            {
+                $filescss=(array) $filescss;	// To be sure filecss is an array
+                foreach($filescss as $cssfile)
+                {
+                    if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    // cssfile is a relative path
+                    print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
+                    // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+                    if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+                    print '">'."\n";
+                }
+            }
+        }
+        // CSS forced by page in top_htmlhead call (relative url starting with /)
+        if (is_array($arrayofcss))
+        {
+            foreach($arrayofcss as $cssfile)
+            {
+                print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+                // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
+                if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+                print '">'."\n";
+            }
+        }
+
+        // Output standard javascript links
+        if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+        {
+            // JQuery. Must be before other includes
+            print '<!-- Includes JS for JQuery -->'."\n";
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+            {
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            // jQuery jnotify
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+            {
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            // Flot
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+            {
+                if (constant('JS_JQUERY_FLOT'))
+                {
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                }
+                else
+                {
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                }
+            }
+            // jQuery jeditable
+            if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+            {
+                print '<!-- JS to manage editInPlace feature -->'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript">'."\n";
+                print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
+                print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
+                print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
+                print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+                print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
+                print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
+                print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
+                print 'var withInPlace = 300;';		// width in pixel for default string edit
+                print '</script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
             // jQuery Timepicker
             if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
             if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
+                $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
             }
             if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-		}
+        }
 
         if (! $disablejs && ! empty($conf->use_javascript_ajax))
         {
@@ -1396,7 +1396,7 @@ 
                 $jsckeditor='ckeditor.js';
                 if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
                 {
-                	$pathckeditor=constant('JS_CKEDITOR');
+                    $pathckeditor=constant('JS_CKEDITOR');
                 }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
@@ -1426,18 +1426,18 @@ 
 
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-        	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
-	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
-		            {
-	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
-		            }
-	            }
-        	}
+            {
+                $arrayjs=(array) $conf->modules_parts['js'];
+                foreach($arrayjs as $modjs => $filesjs)
+                {
+                    $filesjs=(array) $filesjs;	// To be sure filejs is an array
+                    foreach($filesjs as $jsfile)
+                    {
+                        // jsfile is a relative path
+                        print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+                    }
+                }
+            }
             // JS forced by page in top_htmlhead (relative url starting with /)
             if (is_array($arrayofjs))
             {
@@ -1484,192 +1484,192 @@ 
  */
 function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='')
 {
-	global $user, $conf, $langs, $db;
-	global $dolibarr_main_authentication, $dolibarr_main_demo;
-	global $hookmanager,$menumanager;
+    global $user, $conf, $langs, $db;
+    global $dolibarr_main_authentication, $dolibarr_main_demo;
+    global $hookmanager,$menumanager;
 
-	$searchform='';
-	$bookmarks='';
+    $searchform='';
+    $bookmarks='';
 
-	// Instantiate hooks of thirdparty module
-	$hookmanager->initHooks(array('toprightmenu'));
+    // Instantiate hooks of thirdparty module
+    $hookmanager->initHooks(array('toprightmenu'));
 
-	$toprightmenu='';
+    $toprightmenu='';
 
-	// For backward compatibility with old modules
-	if (empty($conf->headerdone))
-	{
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-		print '<body id="mainbody">';
-	}
+    // For backward compatibility with old modules
+    if (empty($conf->headerdone))
+    {
+        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+        print '<body id="mainbody">';
+    }
 
-	/*
+    /*
      * Top menu
      */
-	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int')) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
-	{
-		print "\n".'<!-- Start top horizontal -->'."\n";
+    if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int')) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+    {
+        print "\n".'<!-- Start top horizontal -->'."\n";
 
-		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">';		// dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+        print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">';		// dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 
-		// Show menu entries
-		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-		$menumanager->atarget=$target;
-		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
-		print "</div>\n";
+        // Show menu entries
+        print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
+        $menumanager->atarget=$target;
+        $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
+        print "</div>\n";
 
-		// Define link to login card
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-		{
-			$appli=$conf->global->MAIN_APPLICATION_TITLE;
-			if (preg_match('/\d\.\d/', $appli))
-			{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-			}
-			else $appli.=" ".DOL_VERSION;
-		}
-		else $appli.=" ".DOL_VERSION;
+        // Define link to login card
+        $appli=constant('DOL_APPLICATION_TITLE');
+        if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+        {
+            $appli=$conf->global->MAIN_APPLICATION_TITLE;
+            if (preg_match('/\d\.\d/', $appli))
+            {
+                if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+            }
+            else $appli.=" ".DOL_VERSION;
+        }
+        else $appli.=" ".DOL_VERSION;
 
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+        if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
-		$logouttext='';
-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
-			//$logouthtmltext=$appli.'<br>';
-			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
-			{
-				$logouthtmltext.=$langs->trans("Logout").'<br>';
-
-				$logouttext .='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
-				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-				$logouttext .='</a>';
-			}
-			else
-			{
-				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
-				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-			}
-		}
+        $logouttext='';
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        {
+            //$logouthtmltext=$appli.'<br>';
+            if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
+            {
+                $logouthtmltext.=$langs->trans("Logout").'<br>';
 
-		print '<div class="login_block">'."\n";
+                $logouttext .='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
+                //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                $logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
+                $logouttext .='</a>';
+            }
+            else
+            {
+                $logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+                $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+            }
+        }
 
-		// Add login user link
-		$toprightmenu.='<div class="login_block_user">';
+        print '<div class="login_block">'."\n";
 
-		// Login name with photo and tooltip
-		$mode=-1;
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-		$toprightmenu.=$user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-		$toprightmenu.='</div></div>';
+        // Add login user link
+        $toprightmenu.='<div class="login_block_user">';
 
-		$toprightmenu.='</div>'."\n";
+        // Login name with photo and tooltip
+        $mode=-1;
+        $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+        $toprightmenu.=$user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
+        $toprightmenu.='</div></div>';
 
-		$toprightmenu.='<div class="login_block_other">';
+        $toprightmenu.='</div>'."\n";
 
-		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-		$parameters=array();
-		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if (is_numeric($result))
-		{
-			if ($result == 0)
-				$toprightmenu.=$hookmanager->resPrint;		// add
-			else
-				$toprightmenu=$hookmanager->resPrint;						// replace
-		}
-		else
-		{
-			$toprightmenu.=$result;	// For backward compatibility
-		}
+        $toprightmenu.='<div class="login_block_other">';
 
-		// Link to module builder
-		if (! empty($conf->modulebuilder->enabled))
-		{
-			$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-bug atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
-		}
+        // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
+        $parameters=array();
+        $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+        if (is_numeric($result))
+        {
+            if ($result == 0)
+                $toprightmenu.=$hookmanager->resPrint;		// add
+            else
+                $toprightmenu=$hookmanager->resPrint;						// replace
+        }
+        else
+        {
+            $toprightmenu.=$result;	// For backward compatibility
+        }
 
-		// Link to print main content area
-		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
-		{
-			$qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-
-			if (is_array($_POST))
-			{
-				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
-				}
-			}
-			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-			$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
-			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-print atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
-		}
+        // Link to module builder
+        if (! empty($conf->modulebuilder->enabled))
+        {
+            $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+            //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
+            $text.='<span class="fa fa-bug atoplogin"></span>';
+            $text.='</a>';
+            $toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+        }
 
-		// Link to Dolibarr wiki pages
-		if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
-			$langs->load("help");
+        // Link to print main content area
+        if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
+        {
+            $qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+
+            if (is_array($_POST))
+            {
+                foreach($_POST as $key=>$value) {
+                    if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+                }
+            }
+            $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
+            $text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+            //$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
+            $text.='<span class="fa fa-print atoplogin"></span>';
+            $text.='</a>';
+            $toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+        }
+
+        // Link to Dolibarr wiki pages
+        if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        {
+            $langs->load("help");
 
-			$helpbaseurl='';
-			$helppage='';
-			$mode='';
+            $helpbaseurl='';
+            $helppage='';
+            $mode='';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+            if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
 
-			// Get helpbaseurl, helppage and mode from helppagename and langs
-			$arrayres=getHelpParamFor($helppagename,$langs);
-			$helpbaseurl=$arrayres['helpbaseurl'];
-			$helppage=$arrayres['helppage'];
-			$mode=$arrayres['mode'];
+            // Get helpbaseurl, helppage and mode from helppagename and langs
+            $arrayres=getHelpParamFor($helppagename,$langs);
+            $helpbaseurl=$arrayres['helpbaseurl'];
+            $helppage=$arrayres['helppage'];
+            $mode=$arrayres['mode'];
 
-			// Link to help pages
-			if ($helpbaseurl && $helppage)
-			{
-				$text='';
-	            if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
+            // Link to help pages
+            if ($helpbaseurl && $helppage)
+            {
+                $text='';
+                if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                     $langs->load('admin');
                     $appli .= '<br>' . $langs->trans("Database") . ': ' . $db->database_name;
                 }
-				$title=$appli.'<br>';
-				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-				$text.='<a class="help" target="_blank" rel="noopener" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl,$helppage);
-				$text.='">';
-				//$text.=img_picto('', 'helpdoc_top').' ';
-				$text.='<span class="fa fa-question-circle atoplogin"></span>';
-				//$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
-				//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
-				$text.='</a>';
-				//$toprightmenu.='</div>'."\n";
-				$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
-			}
-		}
+                $title=$appli.'<br>';
+                $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
+                if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+                $text.='<a class="help" target="_blank" rel="noopener" href="';
+                if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
+                else $text.=sprintf($helpbaseurl,$helppage);
+                $text.='">';
+                //$text.=img_picto('', 'helpdoc_top').' ';
+                $text.='<span class="fa fa-question-circle atoplogin"></span>';
+                //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
+                //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
+                $text.='</a>';
+                //$toprightmenu.='</div>'."\n";
+                $toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+            }
+        }
 
-		// Logout link
-		$toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+        // Logout link
+        $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
 
-		$toprightmenu.='</div>';
+        $toprightmenu.='</div>';
 
-		print $toprightmenu;
+        print $toprightmenu;
 
-		print "</div>\n";		// end div class="login_block"
+        print "</div>\n";		// end div class="login_block"
 
-		print '</div></div>';
+        print '</div></div>';
 
-		print '<div style="clear: both;"></div>';
-		print "<!-- End top horizontal menu -->\n\n";
-	}
+        print '<div style="clear: both;"></div>';
+        print "<!-- End top horizontal menu -->\n\n";
+    }
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
 }
 
 
@@ -1689,172 +1689,172 @@ 
  */
 function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
 {
-	global $user, $conf, $langs, $db, $form;
-	global $hookmanager, $menumanager;
+    global $user, $conf, $langs, $db, $form;
+    global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+    $searchform='';
+    $bookmarks='';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
-	{
-		// Instantiate hooks of thirdparty module
-		$hookmanager->initHooks(array('searchform','leftblock'));
+    if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+    {
+        // Instantiate hooks of thirdparty module
+        $hookmanager->initHooks(array('searchform','leftblock'));
 
-		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
+        print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+        if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
-		print "\n";
+        print "\n";
 
-		if (! is_object($form)) $form=new Form($db);
-		$selected=-1;
-		$usedbyinclude=1;
-		include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
+        if (! is_object($form)) $form=new Form($db);
+        $selected=-1;
+        $usedbyinclude=1;
+        include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
 
-		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
-		{
-			//$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-			$searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-		}
-		else
-		{
-			foreach($arrayresult as $key => $val)
-			{
-				//$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleft', img_picto('',$val['img']));
-				$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
-			}
-		}
+        if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+        {
+            //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+            $searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+        }
+        else
+        {
+            foreach($arrayresult as $key => $val)
+            {
+                //$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleft', img_picto('',$val['img']));
+                $searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
+            }
+        }
 
-		// Execute hook printSearchForm
-		$parameters=array('searchform'=>$searchform);
-		$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
-			$searchform.=$hookmanager->resPrint;
-		}
-		else $searchform=$hookmanager->resPrint;
+        // Execute hook printSearchForm
+        $parameters=array('searchform'=>$searchform);
+        $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+        if (empty($reshook))
+        {
+            $searchform.=$hookmanager->resPrint;
+        }
+        else $searchform=$hookmanager->resPrint;
 
-		// Force special value for $searchform
-		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
-		{
-			$urltosearch=DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
-		}
-		elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
-		{
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-			$searchform.='<script type="text/javascript">
+        // Force special value for $searchform
+        if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
+        {
+            $urltosearch=DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
+            $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
+        }
+        elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+        {
+            $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+            $searchform.='<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-			$searchform.='</div>';
-		}
+            $searchform.='</div>';
+        }
 
-		// Define $bookmarks
-		if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
-		{
-			include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
-			$langs->load("bookmarks");
+        // Define $bookmarks
+        if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+        {
+            include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
+            $langs->load("bookmarks");
 
-			$bookmarks=printBookmarksList($db, $langs);
-		}
+            $bookmarks=printBookmarksList($db, $langs);
+        }
 
-		// Left column
-		print '<!-- Begin left menu -->'."\n";
+        // Left column
+        print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+        print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
 
-		// Show left menu with other forms
-		$menumanager->menu_array = $menu_array_before;
-		$menumanager->menu_array_after = $menu_array_after;
-		$menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
+        // Show left menu with other forms
+        $menumanager->menu_array = $menu_array_before;
+        $menumanager->menu_array_after = $menu_array_after;
+        $menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
 
-		// Dolibarr version + help + bug report link
-		print "\n";
-		print "<!-- Begin Help Block-->\n";
-		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
+        // Dolibarr version + help + bug report link
+        print "\n";
+        print "<!-- Begin Help Block-->\n";
+        print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
-		// Version
-		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
-		{
-			$doliurl='https://www.dolibarr.org';
-			//local communities
-			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-
-			$appli=constant('DOL_APPLICATION_TITLE');
-			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-			{
-				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
-				if (preg_match('/\d\.\d/', $appli))
-				{
-					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-				}
-				else $appli.=" ".DOL_VERSION;
-			}
-			else $appli.=" ".DOL_VERSION;
-			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
-			else print '<span class="help">';
-			print $appli;
-			if ($doliurl) print '</a>';
-			else print '</span>';
-			print '</div>'."\n";
-		}
+        // Version
+        if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+        {
+            $doliurl='https://www.dolibarr.org';
+            //local communities
+            if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
+            if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
+            if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
+            if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
+            if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
+
+            $appli=constant('DOL_APPLICATION_TITLE');
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+            {
+                $appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+                if (preg_match('/\d\.\d/', $appli))
+                {
+                    if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+                }
+                else $appli.=" ".DOL_VERSION;
+            }
+            else $appli.=" ".DOL_VERSION;
+            print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
+            if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
+            else print '<span class="help">';
+            print $appli;
+            if ($doliurl) print '</a>';
+            else print '</span>';
+            print '</div>'."\n";
+        }
 
-		// Link to bugtrack
-		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
-			$bugbaseurl.= '?title=';
-			$bugbaseurl.= urlencode("Bug: ");
-			$bugbaseurl.= '&body=';
-			$bugbaseurl.= urlencode("# Bug\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Environment\n");
-			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
-			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
-			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Report\n");
-			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-			print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
-			print '</div>';
-		}
+        // Link to bugtrack
+        if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+            $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
+            $bugbaseurl.= '?title=';
+            $bugbaseurl.= urlencode("Bug: ");
+            $bugbaseurl.= '&body=';
+            $bugbaseurl.= urlencode("# Bug\n");
+            $bugbaseurl.= urlencode("\n");
+            $bugbaseurl.= urlencode("## Environment\n");
+            $bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
+            $bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
+            $bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
+            $bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
+            $bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
+            $bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+            $bugbaseurl.= urlencode("\n");
+            $bugbaseurl.= urlencode("## Report\n");
+            print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
+            print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
+            print '</div>';
+        }
 
-		print "</div>\n";
-		print "<!-- End Help Block-->\n";
-		print "\n";
+        print "</div>\n";
+        print "<!-- End Help Block-->\n";
+        print "\n";
 
-		print "</div>\n";
-		print "<!-- End left menu -->\n";
-		print "\n";
+        print "</div>\n";
+        print "<!-- End left menu -->\n";
+        print "\n";
 
-		// Execute hook printLeftBlock
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
-		print $hookmanager->resPrint;
+        // Execute hook printLeftBlock
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
+        print $hookmanager->resPrint;
 
-		print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
-	}
+        print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
+    }
 
-	print "\n";
-	print '<!-- Begin right area -->'."\n";
+    print "\n";
+    print '<!-- Begin right area -->'."\n";
 
-	if (empty($leftmenuwithoutmainarea)) main_area($title);
+    if (empty($leftmenuwithoutmainarea)) main_area($title);
 }
 
 
@@ -1866,15 +1866,15 @@ 
  */
 function main_area($title='')
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
+    if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
 
-	print "\n";
+    print "\n";
 
-	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
 
@@ -1887,38 +1887,38 @@ 
  */
 function getHelpParamFor($helppagename,$langs)
 {
-	$helpbaseurl='';
-	$helppage='';
-	$mode='';
-
-	if (preg_match('/^http/i',$helppagename))
-	{
-		// If complete URL
-		$helpbaseurl='%s';
-		$helppage=$helppagename;
-		$mode='local';
-	}
-	else
-	{
-		// If WIKI URL
-		if (preg_match('/^es/i',$langs->defaultlang))
-		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-		}
-		if (preg_match('/^fr/i',$langs->defaultlang))
-		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-		}
-		if (empty($helppage))	// If help page not already found
-		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-		}
-		$mode='wiki';
-	}
-	return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
+    $helpbaseurl='';
+    $helppage='';
+    $mode='';
+
+    if (preg_match('/^http/i',$helppagename))
+    {
+        // If complete URL
+        $helpbaseurl='%s';
+        $helppage=$helppagename;
+        $mode='local';
+    }
+    else
+    {
+        // If WIKI URL
+        if (preg_match('/^es/i',$langs->defaultlang))
+        {
+            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+        if (preg_match('/^fr/i',$langs->defaultlang))
+        {
+            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+        if (empty($helppage))	// If help page not already found
+        {
+            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+        $mode='wiki';
+    }
+    return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
 }
 
 
@@ -1939,138 +1939,138 @@ 
  */
 function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='', $showtitlebefore=0)
 {
-	global $conf,$langs,$user;
-
-	$ret='';
-	$ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
-	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$ret.='<input type="hidden" name="mode" value="search">';
-	$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	if ($showtitlebefore) $ret.=$title.' ';
-	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-	$ret.=' placeholder="'.strip_tags($title).'"';
-	$ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
-	//$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-	$ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
-	$ret.='<span class="fa fa-search"></span>';
-	$ret.='</button>';
-	$ret.="</form>\n";
-	return $ret;
+    global $conf,$langs,$user;
+
+    $ret='';
+    $ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
+    $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    $ret.='<input type="hidden" name="mode" value="search">';
+    $ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
+    if ($showtitlebefore) $ret.=$title.' ';
+    $ret.='<input type="text" class="flat '.$htmlmorecss.'"';
+    $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+    $ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
+    $ret.=' placeholder="'.strip_tags($title).'"';
+    $ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+    //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
+    $ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
+    $ret.='<span class="fa fa-search"></span>';
+    $ret.='</button>';
+    $ret.="</form>\n";
+    return $ret;
 }
 
 
 if (! function_exists("llxFooter"))
 {
-	/**
-	 * Show HTML footer
-	 * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
-	 * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
-	 *
-	 * @param	string	$comment    				A text to add as HTML comment into HTML generated page
-	 * @param	string	$zone						'private' (for private pages) or 'public' (for public pages)
-	 * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
-	 * @return	void
-	 */
-	function llxFooter($comment='',$zone='private', $disabledoutputofmessages=0)
-	{
-		global $conf, $langs, $user, $object;
-		global $delayedhtmlcontent;
-		global $contextpage, $page, $limit;
+    /**
+     * Show HTML footer
+     * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
+     * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
+     *
+     * @param	string	$comment    				A text to add as HTML comment into HTML generated page
+     * @param	string	$zone						'private' (for private pages) or 'public' (for public pages)
+     * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
+     * @return	void
+     */
+    function llxFooter($comment='',$zone='private', $disabledoutputofmessages=0)
+    {
+        global $conf, $langs, $user, $object;
+        global $delayedhtmlcontent;
+        global $contextpage, $page, $limit;
 
-		$ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
+        $ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
-		// Global html output events ($mesgs, $errors, $warnings)
-		dol_htmloutput_events($disabledoutputofmessages);
+        // Global html output events ($mesgs, $errors, $warnings)
+        dol_htmloutput_events($disabledoutputofmessages);
 
-		// Code for search criteria persistence.
-		// $user->lastsearch_values was set by the GETPOST when form field search_xxx exists
-		if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
-		{
-			// Clean and save data
-			foreach($user->lastsearch_values_tmp as $key => $val)
-			{
-				unset($_SESSION['lastsearch_values_tmp_'.$key]);			// Clean array to rebuild it just after
-				if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
-				{
-					if (empty($val['sortfield'])) unset($val['sortfield']);
-					if (empty($val['sortorder'])) unset($val['sortorder']);
-					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
-					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
-					unset($_SESSION['lastsearch_values_'.$key]);
-				}
-			}
-		}
+        // Code for search criteria persistence.
+        // $user->lastsearch_values was set by the GETPOST when form field search_xxx exists
+        if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+        {
+            // Clean and save data
+            foreach($user->lastsearch_values_tmp as $key => $val)
+            {
+                unset($_SESSION['lastsearch_values_tmp_'.$key]);			// Clean array to rebuild it just after
+                if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
+                {
+                    if (empty($val['sortfield'])) unset($val['sortfield']);
+                    if (empty($val['sortorder'])) unset($val['sortorder']);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
+                }
+            }
+        }
 
 
-		$relativepathstring = $_SERVER["PHP_SELF"];
-		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-		if (preg_match('/list\.php$/', $relativepathstring))
-		{
-			unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+        $relativepathstring = $_SERVER["PHP_SELF"];
+        // Clean $relativepathstring
+        if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+        $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+        $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+        if (preg_match('/list\.php$/', $relativepathstring))
+        {
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
-			if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
-			if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
-			if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
+            if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
+            if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
+            if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
 
-			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
-		}
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
+        }
 
-		// Core error message
-		if (! empty($conf->global->MAIN_CORE_ERROR))
-		{
-			// Ajax version
-			if ($conf->use_javascript_ajax)
-			{
-				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
-				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
-			}
-			// html version
-			else
-			{
-				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');
-				print '<div class="error">'.$msg.'</div>';
-			}
-
-			//define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
-		}
+        // Core error message
+        if (! empty($conf->global->MAIN_CORE_ERROR))
+        {
+            // Ajax version
+            if ($conf->use_javascript_ajax)
+            {
+                $title = img_warning().' '.$langs->trans('CoreErrorTitle');
+                print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
+            }
+            // html version
+            else
+            {
+                $msg = img_warning().' '.$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
+            }
 
-		print "\n\n";
+            //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
+        }
 
-		print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
+        print "\n\n";
 
-		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+        if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
-		print "\n";
-		if ($comment) print '<!-- '.$comment.' -->'."\n";
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
 
-		printCommonFooter($zone);
+        print "\n";
+        if ($comment) print '<!-- '.$comment.' -->'."\n";
 
-		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+        printCommonFooter($zone);
 
-		if (! empty($conf->use_javascript_ajax))
-		{
-			print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
-		}
+        if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-		// Wrapper to add log when clicking on download or preview
-		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
-		{
-			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
-			{
-				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
-				?>
+        if (! empty($conf->use_javascript_ajax))
+        {
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
+        }
+
+        // Wrapper to add log when clicking on download or preview
+        if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+        {
+            if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+            {
+                print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+                ?>
     			<script type="text/javascript">
     			jQuery(document).ready(function () {
     				$('a.documentpreview').click(function() {
@@ -2094,14 +2094,14 @@ 
     			});
     			</script>
 				<?php
-			}
-	   	}
+            }
+            }
 
-		// A div for the address popup
-		print "\n<!-- A div to allow dialog popup -->\n";
-		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
+        // A div for the address popup
+        print "\n<!-- A div to allow dialog popup -->\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
-		print "</body>\n";
-		print "</html>\n";
-	}
+        print "</body>\n";
+        print "</html>\n";
+    }
 }

dolibarr/htdocs/margin/index.php

Indentation +3 added lines, -3 removed lines

@@ -25,11 +25,11 @@
 require '../main.inc.php';
 
 if ($user->rights->produit->lire) {
-	$page = 'productMargins';
+    $page = 'productMargins';
 } elseif ($user->rights->societe->lire) {
-	$page = 'customerMargins';
+    $page = 'customerMargins';
 } else {
-	$page = 'agentMargins';
+    $page = 'agentMargins';
 }
 
 header('Location: '.dol_buildpath('/margin/'.$page.'.php', 1));

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

Indentation +6816 added lines, -6816 removed lines

@@ -51,564 +51,564 @@ 
  */
 class Form
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
      * @var string[]    Array of error strings
      */
     public $errors = array();
 
-	public $num;
-
-	// Cache arrays
-	public $cache_types_paiements=array();
-	public $cache_conditions_paiements=array();
-	public $cache_availability=array();
-	public $cache_demand_reason=array();
-	public $cache_types_fees=array();
-	public $cache_vatrates=array();
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param		DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Output key field for an editable field
-	 *
-	 * @param   string	$text			Text of label or key to translate
-	 * @param   string	$htmlname		Name of select field ('edit' prefix will be added)
-	 * @param   string	$preselected    Value to show/edit (not used in this function)
-	 * @param	object	$object			Object
-	 * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
-	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
-	 * @param	string	$moreparam		More param to add on a href URL.
-	 * @param   int     $fieldrequired  1 if we want to show field as mandatory using the "fieldrequired" CSS.
-	 * @param   int     $notabletag     1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
-	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
-	 * @return	string					HTML edit field
-	 */
-	function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata='string', $moreparam='', $fieldrequired=0, $notabletag=0, $paramid='id')
-	{
-		global $conf,$langs;
-
-		$ret='';
-
-		// TODO change for compatibility
-		if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/',$typeofdata))
-		{
-			if (! empty($perm))
-			{
-				$tmp=explode(':',$typeofdata);
-				$ret.= '<div class="editkey_'.$tmp[0].(! empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';
-				if ($fieldrequired) $ret.='<span class="fieldrequired">';
-				$ret.= $langs->trans($text);
-				if ($fieldrequired) $ret.='</span>';
-				$ret.= '</div>'."\n";
-			}
-			else
-			{
-				if ($fieldrequired) $ret.='<span class="fieldrequired">';
-				$ret.= $langs->trans($text);
-				if ($fieldrequired) $ret.='</span>';
-			}
-		}
-		else
-		{
-			if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
-			if ($fieldrequired) $ret.='<span class="fieldrequired">';
-			$ret.=$langs->trans($text);
-			if ($fieldrequired) $ret.='</span>';
-			if (! empty($notabletag)) $ret.=' ';
-			if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
-			if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<td align="right">';
-			if ($htmlname && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
-			if (! empty($notabletag) && $notabletag == 1) $ret.=' : ';
-			if (! empty($notabletag) && $notabletag == 3) $ret.=' ';
-			if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
-			if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</tr></table>';
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Output value of a field for an editable field
-	 *
-	 * @param	string	$text			Text of label (not used in this function)
-	 * @param	string	$htmlname		Name of select field
-	 * @param	string	$value			Value to show/edit
-	 * @param	object	$object			Object
-	 * @param	boolean	$perm			Permission to allow button to edit parameter
-	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...)
-	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value
-	 * @param	object	$extObject		External object
-	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
-	 * @param	string	$moreparam		More param to add on the form action href URL
-	 * @param   int     $notabletag     Do no output table tags
-	 * @param	string	$formatfunc		Call a specific function to output field
-	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
-	 * @return  string					HTML edit field
-	 */
-	function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $custommsg=null, $moreparam='', $notabletag=0, $formatfunc='', $paramid='id')
-	{
-		global $conf,$langs,$db;
-
-		$ret='';
-
-		// Check parameters
-		if (empty($typeofdata)) return 'ErrorBadParameter';
-
-		// When option to edit inline is activated
-		if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // TODO add jquery timepicker
-		{
-			$ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
-		}
-		else
-		{
-			if (GETPOST('action','aZ09') == 'edit'.$htmlname)
-			{
-				$ret.="\n";
-				$ret.='<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam?'?'.$moreparam:'').'">';
-				$ret.='<input type="hidden" name="action" value="set'.$htmlname.'">';
-				$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				$ret.='<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';
-				if (empty($notabletag)) $ret.='<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
-				if (empty($notabletag)) $ret.='<tr><td>';
-				if (preg_match('/^(string|email)/',$typeofdata))
-				{
-					$tmp=explode(':',$typeofdata);
-					$ret.='<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue?$editvalue:$value).'"'.($tmp[1]?' size="'.$tmp[1].'"':'').'>';
-				}
-				else if (preg_match('/^(numeric|amount)/',$typeofdata))
-				{
-					$tmp=explode(':',$typeofdata);
-					$valuetoshow=price2num($editvalue?$editvalue:$value);
-					$ret.='<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow!=''?price($valuetoshow):'').'"'.($tmp[1]?' size="'.$tmp[1].'"':'').'>';
-				}
-				else if (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))
-				{
-					$tmp=explode(':',$typeofdata);
-					$cols=$tmp[2];
-					$morealt='';
-					if (preg_match('/%/',$cols))
-					{
-						$morealt=' style="width: '.$cols.'"';
-						$cols='';
-					}
+    public $num;
 
-					$valuetoshow = ($editvalue?$editvalue:$value);
-
-					$ret.='<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1]?$tmp[1]:'20').'"'.($cols?' cols="'.$cols.'"':'class="quatrevingtpercent"').$morealt.'">';
-					$ret.=dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
-					$ret.='</textarea>';
-				}
-				else if ($typeofdata == 'day' || $typeofdata == 'datepicker')
-				{
-					$ret.=$this->selectDate($value,$htmlname,0,0,1,'form'.$htmlname,1,0);
-				}
-				else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
-				{
-					$ret.=$this->selectDate($value,$htmlname,1,1,1,'form'.$htmlname,1,0);
-				}
-				else if (preg_match('/^select;/',$typeofdata))
-				{
-					 $arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
-					 foreach($arraydata as $val)
-					 {
-						 $tmp=explode(':',$val);
-						 $arraylist[$tmp[0]]=$tmp[1];
-					 }
-					 $ret.=$this->selectarray($htmlname,$arraylist,$value);
-				}
-				else if (preg_match('/^ckeditor/',$typeofdata))
-				{
-					$tmp=explode(':',$typeofdata);		// Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols
-					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$doleditor=new DolEditor($htmlname, ($editvalue?$editvalue:$value), ($tmp[2]?$tmp[2]:''), ($tmp[3]?$tmp[3]:'100'), ($tmp[1]?$tmp[1]:'dolibarr_notes'), 'In', ($tmp[5]?$tmp[5]:0), true, true, ($tmp[6]?$tmp[6]:'20'), ($tmp[7]?$tmp[7]:'100'));
-					$ret.=$doleditor->Create(1);
-				}
-				if (empty($notabletag)) $ret.='</td>';
-
-				if (empty($notabletag)) $ret.='<td align="left">';
-				//else $ret.='<div class="clearboth"></div>';
-			   	$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' ').'" name="modify" value="'.$langs->trans("Modify").'">';
-			   	if (preg_match('/ckeditor|textarea/',$typeofdata) && empty($notabletag)) $ret.='<br>'."\n";
-			   	$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
-			   	if (empty($notabletag)) $ret.='</td>';
-
-			   	if (empty($notabletag)) $ret.='</tr></table>'."\n";
-				$ret.='</form>'."\n";
-			}
-			else
-			{
-				if (preg_match('/^(email)/',$typeofdata))              $ret.=dol_print_email($value,0,0,0,0,1);
-				elseif (preg_match('/^(amount|numeric)/',$typeofdata)) $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : '');
-				elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))  $ret.=dol_htmlentitiesbr($value);
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
-				else if (preg_match('/^select;/',$typeofdata))
-				{
-					$arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
-					foreach($arraydata as $val)
-					{
-						$tmp=explode(':',$val);
-						$arraylist[$tmp[0]]=$tmp[1];
-					}
-					$ret.=$arraylist[$value];
-				}
-				else if (preg_match('/^ckeditor/',$typeofdata))
-				{
-					$tmpcontent=dol_htmlentitiesbr($value);
-					if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-					{
-						$firstline=preg_replace('/<br>.*/','',$tmpcontent);
-						$firstline=preg_replace('/[\n\r].*/','',$firstline);
-						$tmpcontent=$firstline.((strlen($firstline) != strlen($tmpcontent))?'...':'');
-					}
-					$ret.=$tmpcontent;
-				}
-				else $ret.=$value;
-
-				if ($formatfunc && method_exists($object, $formatfunc))
-				{
-					$ret=$object->$formatfunc($ret);
-				}
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Output edit in place form
-	 *
-	 * @param	object	$object			Object
-	 * @param	string	$value			Value to show/edit
-	 * @param	string	$htmlname		DIV ID (field name)
-	 * @param	int		$condition		Condition to edit
-	 * @param	string	$inputType		Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:xxx')
-	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value
-	 * @param	object	$extObject		External object
-	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
-	 * @return	string   		      	HTML edit in place
-	 */
-	private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $custommsg=null)
-	{
-		global $conf;
-
-		$out='';
-
-		// Check parameters
-		if (preg_match('/^text/',$inputType)) $value = dol_nl2br($value);
-		else if (preg_match('/^numeric/',$inputType)) $value = price($value);
-		else if ($inputType == 'day' || $inputType == 'datepicker') $value = dol_print_date($value, 'day');
-
-		if ($condition)
-		{
-			$element		= false;
-			$table_element	= false;
-			$fk_element		= false;
-			$loadmethod		= false;
-			$savemethod		= false;
-			$ext_element	= false;
-			$button_only	= false;
-			$inputOption    = '';
-
-			if (is_object($object))
-			{
-				$element = $object->element;
-				$table_element = $object->table_element;
-				$fk_element = $object->id;
-			}
-
-			if (is_object($extObject))
-			{
-				$ext_element = $extObject->element;
-			}
-
-			if (preg_match('/^(string|email|numeric)/',$inputType))
-			{
-				$tmp=explode(':',$inputType);
-				$inputType=$tmp[0];
-				if (! empty($tmp[1])) $inputOption=$tmp[1];
-				if (! empty($tmp[2])) $savemethod=$tmp[2];
-				$out.= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
-			}
-			else if ((preg_match('/^day$/',$inputType)) || (preg_match('/^datepicker/',$inputType)) || (preg_match('/^datehourpicker/',$inputType)))
-			{
-				$tmp=explode(':',$inputType);
-				$inputType=$tmp[0];
-				if (! empty($tmp[1])) $inputOption=$tmp[1];
-				if (! empty($tmp[2])) $savemethod=$tmp[2];
-
-				$out.= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
-			}
-			else if (preg_match('/^(select|autocomplete)/',$inputType))
-			{
-				$tmp=explode(':',$inputType);
-				$inputType=$tmp[0]; $loadmethod=$tmp[1];
-				if (! empty($tmp[2])) $savemethod=$tmp[2];
-				if (! empty($tmp[3])) $button_only=true;
-			}
-			else if (preg_match('/^textarea/',$inputType))
-			{
-				$tmp=explode(':',$inputType);
-				$inputType=$tmp[0];
-				$rows=(empty($tmp[1])?'8':$tmp[1]);
-				$cols=(empty($tmp[2])?'80':$tmp[2]);
-			}
-			else if (preg_match('/^ckeditor/',$inputType))
-			{
-				$tmp=explode(':',$inputType);
-				$inputType=$tmp[0]; $toolbar=$tmp[1];
-				if (! empty($tmp[2])) $width=$tmp[2];
-				if (! empty($tmp[3])) $heigth=$tmp[3];
-				if (! empty($tmp[4])) $savemethod=$tmp[4];
-
-				if (! empty($conf->fckeditor->enabled))
-				{
-					$out.= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
-				}
-				else
-				{
-					$inputType = 'textarea';
-				}
-			}
-
-			$out.= '<input id="element_'.$htmlname.'" value="'.$element.'" type="hidden"/>'."\n";
-			$out.= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";
-			$out.= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";
-			$out.= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";
-			if (! empty($savemethod))	$out.= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
-			if (! empty($ext_element))	$out.= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
-			if (! empty($custommsg))
-			{
-				if (is_array($custommsg))
-				{
-					if (!empty($custommsg['success']))
-						$out.= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
-					if (!empty($custommsg['error']))
-						$out.= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				}
-				else
-					$out.= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
-			}
-			if ($inputType == 'textarea') {
-				$out.= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
-				$out.= '<input id="textarea_'.$htmlname.'_cols" value="'.$cols.'" type="hidden"/>'."\n";
-			}
-			$out.= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
-			$out.= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(! empty($editvalue) ? $editvalue : $value).'</span>'."\n";
-		}
-		else
-		{
-			$out = $value;
-		}
-
-		return $out;
-	}
-
-	/**
-	 *	Show a text and picto with tooltip on text or picto.
-	 *  Can be called by an instancied $form->textwithtooltip or by a static call Form::textwithtooltip
-	 *
-	 *	@param	string		$text				Text to show
-	 *	@param	string		$htmltext			HTML content of tooltip. Must be HTML/UTF8 encoded.
-	 *	@param	int			$tooltipon			1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2
-	 *	@param	int			$direction			-1=image is before, 0=no image, 1=image is after
-	 *	@param	string		$img				Html code for image (use img_xxx() function to get it)
-	 *	@param	string		$extracss			Add a CSS style to td tags
-	 *	@param	int			$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
-	 *	@param	string		$incbefore			Include code before the text
-	 *	@param	int			$noencodehtmltext	Do not encode into html entity the htmltext
-	 *  @param  string      $tooltiptrigger		''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
-	 *  @param	int			$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
-	 *	@return	string							Code html du tooltip (texte+picto)
-	 *	@see	Use function textwithpicto if you can.
-	 *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
-	 */
-	function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger='', $forcenowrap=0)
-	{
-		global $conf;
-
-		if ($incbefore) $text = $incbefore.$text;
-		if (! $htmltext) return $text;
-
-		$tag='td';
-		if ($notabs == 2) $tag='div';
-		if ($notabs == 3) $tag='span';
-		// Sanitize tooltip
-		$htmltext=str_replace("\\","\\\\",$htmltext);
-		$htmltext=str_replace("\r","",$htmltext);
-		$htmltext=str_replace("\n","",$htmltext);
-
-		$extrastyle='';
-		if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-left: 3px !important;'; }
-		if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
-
-		$classfortooltip='classfortooltip';
-
-		$s='';$textfordialog='';
-
-		if ($tooltiptrigger == '')
-		{
-			$htmltext=str_replace('"',"&quot;",$htmltext);
-		}
-		else
-		{
-			$classfortooltip='classfortooltiponclick';
-			$textfordialog.='<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
-		}
-		if ($tooltipon == 2 || $tooltipon == 3)
-		{
-			$paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
-			if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
-			else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-		if ($tooltipon == 1 || $tooltipon == 3)
-		{
-			$paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
-			if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
-			else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-		if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr style="height: auto;">';
-		elseif ($notabs == 2) $s.='<div class="inline-block'.($forcenowrap?' nowrap':'').'">';
-		// Define value if value is before
-		if ($direction < 0) {
-			$s.='<'.$tag.$paramfortooltipimg;
-			if ($tag == 'td') {
-				$s .= ' valign="top" width="14"';
-			}
-			$s.= '>'.$textfordialog.$img.'</'.$tag.'>';
-		}
-		// Use another method to help avoid having a space in value in order to use this value with jquery
-		// Define label
-		if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
-		// Define value if value is after
-		if ($direction > 0) {
-			$s.='<'.$tag.$paramfortooltipimg;
-			if ($tag == 'td') $s .= ' valign="middle" width="14"';
-			$s.= '>'.$textfordialog.$img.'</'.$tag.'>';
-		}
-		if (empty($notabs)) $s.='</tr></table>';
-		elseif ($notabs == 2) $s.='</div>';
-
-		return $s;
-	}
-
-	/**
-	 *	Show a text with a picto and a tooltip on picto
-	 *
-	 *	@param	string	$text				Text to show
-	 *	@param  string	$htmltext	     	Content of tooltip
-	 *	@param	int		$direction			1=Icon is after text, -1=Icon is before text, 0=no icon
-	 * 	@param	string	$type				Type of picto ('info', 'help', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath
-	 *  @param  string	$extracss           Add a CSS style to td, div or span tag
-	 *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
-	 *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
-	 *  @param  string  $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
-	 *  @param	int		$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
-	 * 	@return	string						HTML code of text, picto, tooltip
-	 */
-	function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='', $forcenowrap=0)
-	{
-		global $conf, $langs;
-
-		$alt = '';
-		if ($tooltiptrigger) $alt=$langs->transnoentitiesnoconv("ClickToShowHelp");
-
-		//For backwards compatibility
-		if ($type == '0') $type = 'info';
-		elseif ($type == '1') $type = 'help';
-
-		// If info or help with no javascript, show only text
-		if (empty($conf->use_javascript_ajax))
-		{
-			if ($type == 'info' || $type == 'help')	return $text;
-			else
-			{
-				$alt = $htmltext;
-				$htmltext = '';
-			}
-		}
-
-		// If info or help with smartphone, show only text (tooltip hover can't works)
-		if (! empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
-		{
-			if ($type == 'info' || $type == 'help') return $text;
-		}
-		// If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone)
-		if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
-		{
-			if ($type == 'info' || $type == 'help') return $text;
-		}
-
-		if ($type == 'info') $img = img_help(0, $alt);
-		elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
-		elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
-		elseif ($type == 'admin') $img = img_picto($alt, 'star');
-		elseif ($type == 'warning') $img = img_warning($alt);
-		else $img = img_picto($alt, $type);
-
-		return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && ! $img)?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
-	}
-
-	/**
-	 * Generate select HTML to choose massaction
-	 *
-	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
-	 * @param	int		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
-	 * @param   int     $alwaysvisible  1=select button always visible
-	 * @return	string					Select list
-	 */
-	function selectMassAction($selected, $arrayofaction, $alwaysvisible=0)
-	{
-		global $conf,$langs,$hookmanager;
-
-		if (count($arrayofaction) == 0) return;
-
-		$disabled=0;
-		$ret='<div class="centpercent center">';
-		$ret.='<select class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
-
-		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-			$ret.='<option value="0"'.($disabled?' disabled="disabled"':'').'>-- '.$langs->trans("SelectAction").' --</option>';
-			foreach($arrayofaction as $code => $label)
-			{
-				$ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
-			}
-		}
-		$ret.=$hookmanager->resPrint;
-
-		$ret.='</select>';
-		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
-		$ret.='<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">';	// Hidden button BEFORE so it is the one used when we submit with ENTER.
-		$ret.='<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
-		$ret.='</div>';
-
-		if (! empty($conf->use_javascript_ajax))
-		{
-			$ret.='<!-- JS CODE TO ENABLE mass action select -->
+    // Cache arrays
+    public $cache_types_paiements=array();
+    public $cache_conditions_paiements=array();
+    public $cache_availability=array();
+    public $cache_demand_reason=array();
+    public $cache_types_fees=array();
+    public $cache_vatrates=array();
+
+
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Output key field for an editable field
+     *
+     * @param   string	$text			Text of label or key to translate
+     * @param   string	$htmlname		Name of select field ('edit' prefix will be added)
+     * @param   string	$preselected    Value to show/edit (not used in this function)
+     * @param	object	$object			Object
+     * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
+     * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
+     * @param	string	$moreparam		More param to add on a href URL.
+     * @param   int     $fieldrequired  1 if we want to show field as mandatory using the "fieldrequired" CSS.
+     * @param   int     $notabletag     1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
+     * @param	string	$paramid		Key of parameter for id ('id', 'socid')
+     * @return	string					HTML edit field
+     */
+    function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata='string', $moreparam='', $fieldrequired=0, $notabletag=0, $paramid='id')
+    {
+        global $conf,$langs;
+
+        $ret='';
+
+        // TODO change for compatibility
+        if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/',$typeofdata))
+        {
+            if (! empty($perm))
+            {
+                $tmp=explode(':',$typeofdata);
+                $ret.= '<div class="editkey_'.$tmp[0].(! empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';
+                if ($fieldrequired) $ret.='<span class="fieldrequired">';
+                $ret.= $langs->trans($text);
+                if ($fieldrequired) $ret.='</span>';
+                $ret.= '</div>'."\n";
+            }
+            else
+            {
+                if ($fieldrequired) $ret.='<span class="fieldrequired">';
+                $ret.= $langs->trans($text);
+                if ($fieldrequired) $ret.='</span>';
+            }
+        }
+        else
+        {
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+            if ($fieldrequired) $ret.='<span class="fieldrequired">';
+            $ret.=$langs->trans($text);
+            if ($fieldrequired) $ret.='</span>';
+            if (! empty($notabletag)) $ret.=' ';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<td align="right">';
+            if ($htmlname && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
+            if (! empty($notabletag) && $notabletag == 1) $ret.=' : ';
+            if (! empty($notabletag) && $notabletag == 3) $ret.=' ';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</tr></table>';
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Output value of a field for an editable field
+     *
+     * @param	string	$text			Text of label (not used in this function)
+     * @param	string	$htmlname		Name of select field
+     * @param	string	$value			Value to show/edit
+     * @param	object	$object			Object
+     * @param	boolean	$perm			Permission to allow button to edit parameter
+     * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...)
+     * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value
+     * @param	object	$extObject		External object
+     * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+     * @param	string	$moreparam		More param to add on the form action href URL
+     * @param   int     $notabletag     Do no output table tags
+     * @param	string	$formatfunc		Call a specific function to output field
+     * @param	string	$paramid		Key of parameter for id ('id', 'socid')
+     * @return  string					HTML edit field
+     */
+    function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $custommsg=null, $moreparam='', $notabletag=0, $formatfunc='', $paramid='id')
+    {
+        global $conf,$langs,$db;
+
+        $ret='';
+
+        // Check parameters
+        if (empty($typeofdata)) return 'ErrorBadParameter';
+
+        // When option to edit inline is activated
+        if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // TODO add jquery timepicker
+        {
+            $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
+        }
+        else
+        {
+            if (GETPOST('action','aZ09') == 'edit'.$htmlname)
+            {
+                $ret.="\n";
+                $ret.='<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam?'?'.$moreparam:'').'">';
+                $ret.='<input type="hidden" name="action" value="set'.$htmlname.'">';
+                $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                $ret.='<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';
+                if (empty($notabletag)) $ret.='<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+                if (empty($notabletag)) $ret.='<tr><td>';
+                if (preg_match('/^(string|email)/',$typeofdata))
+                {
+                    $tmp=explode(':',$typeofdata);
+                    $ret.='<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue?$editvalue:$value).'"'.($tmp[1]?' size="'.$tmp[1].'"':'').'>';
+                }
+                else if (preg_match('/^(numeric|amount)/',$typeofdata))
+                {
+                    $tmp=explode(':',$typeofdata);
+                    $valuetoshow=price2num($editvalue?$editvalue:$value);
+                    $ret.='<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow!=''?price($valuetoshow):'').'"'.($tmp[1]?' size="'.$tmp[1].'"':'').'>';
+                }
+                else if (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))
+                {
+                    $tmp=explode(':',$typeofdata);
+                    $cols=$tmp[2];
+                    $morealt='';
+                    if (preg_match('/%/',$cols))
+                    {
+                        $morealt=' style="width: '.$cols.'"';
+                        $cols='';
+                    }
+
+                    $valuetoshow = ($editvalue?$editvalue:$value);
+
+                    $ret.='<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1]?$tmp[1]:'20').'"'.($cols?' cols="'.$cols.'"':'class="quatrevingtpercent"').$morealt.'">';
+                    $ret.=dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
+                    $ret.='</textarea>';
+                }
+                else if ($typeofdata == 'day' || $typeofdata == 'datepicker')
+                {
+                    $ret.=$this->selectDate($value,$htmlname,0,0,1,'form'.$htmlname,1,0);
+                }
+                else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
+                {
+                    $ret.=$this->selectDate($value,$htmlname,1,1,1,'form'.$htmlname,1,0);
+                }
+                else if (preg_match('/^select;/',$typeofdata))
+                {
+                        $arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
+                        foreach($arraydata as $val)
+                        {
+                            $tmp=explode(':',$val);
+                            $arraylist[$tmp[0]]=$tmp[1];
+                        }
+                        $ret.=$this->selectarray($htmlname,$arraylist,$value);
+                }
+                else if (preg_match('/^ckeditor/',$typeofdata))
+                {
+                    $tmp=explode(':',$typeofdata);		// Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols
+                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                    $doleditor=new DolEditor($htmlname, ($editvalue?$editvalue:$value), ($tmp[2]?$tmp[2]:''), ($tmp[3]?$tmp[3]:'100'), ($tmp[1]?$tmp[1]:'dolibarr_notes'), 'In', ($tmp[5]?$tmp[5]:0), true, true, ($tmp[6]?$tmp[6]:'20'), ($tmp[7]?$tmp[7]:'100'));
+                    $ret.=$doleditor->Create(1);
+                }
+                if (empty($notabletag)) $ret.='</td>';
+
+                if (empty($notabletag)) $ret.='<td align="left">';
+                //else $ret.='<div class="clearboth"></div>';
+                    $ret.='<input type="submit" class="button'.(empty($notabletag)?'':' ').'" name="modify" value="'.$langs->trans("Modify").'">';
+                    if (preg_match('/ckeditor|textarea/',$typeofdata) && empty($notabletag)) $ret.='<br>'."\n";
+                    $ret.='<input type="submit" class="button'.(empty($notabletag)?'':' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
+                    if (empty($notabletag)) $ret.='</td>';
+
+                    if (empty($notabletag)) $ret.='</tr></table>'."\n";
+                $ret.='</form>'."\n";
+            }
+            else
+            {
+                if (preg_match('/^(email)/',$typeofdata))              $ret.=dol_print_email($value,0,0,0,0,1);
+                elseif (preg_match('/^(amount|numeric)/',$typeofdata)) $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : '');
+                elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))  $ret.=dol_htmlentitiesbr($value);
+                elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
+                elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
+                else if (preg_match('/^select;/',$typeofdata))
+                {
+                    $arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
+                    foreach($arraydata as $val)
+                    {
+                        $tmp=explode(':',$val);
+                        $arraylist[$tmp[0]]=$tmp[1];
+                    }
+                    $ret.=$arraylist[$value];
+                }
+                else if (preg_match('/^ckeditor/',$typeofdata))
+                {
+                    $tmpcontent=dol_htmlentitiesbr($value);
+                    if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+                    {
+                        $firstline=preg_replace('/<br>.*/','',$tmpcontent);
+                        $firstline=preg_replace('/[\n\r].*/','',$firstline);
+                        $tmpcontent=$firstline.((strlen($firstline) != strlen($tmpcontent))?'...':'');
+                    }
+                    $ret.=$tmpcontent;
+                }
+                else $ret.=$value;
+
+                if ($formatfunc && method_exists($object, $formatfunc))
+                {
+                    $ret=$object->$formatfunc($ret);
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Output edit in place form
+     *
+     * @param	object	$object			Object
+     * @param	string	$value			Value to show/edit
+     * @param	string	$htmlname		DIV ID (field name)
+     * @param	int		$condition		Condition to edit
+     * @param	string	$inputType		Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:xxx')
+     * @param	string	$editvalue		When in edit mode, use this value as $value instead of value
+     * @param	object	$extObject		External object
+     * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+     * @return	string   		      	HTML edit in place
+     */
+    private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $custommsg=null)
+    {
+        global $conf;
+
+        $out='';
+
+        // Check parameters
+        if (preg_match('/^text/',$inputType)) $value = dol_nl2br($value);
+        else if (preg_match('/^numeric/',$inputType)) $value = price($value);
+        else if ($inputType == 'day' || $inputType == 'datepicker') $value = dol_print_date($value, 'day');
+
+        if ($condition)
+        {
+            $element		= false;
+            $table_element	= false;
+            $fk_element		= false;
+            $loadmethod		= false;
+            $savemethod		= false;
+            $ext_element	= false;
+            $button_only	= false;
+            $inputOption    = '';
+
+            if (is_object($object))
+            {
+                $element = $object->element;
+                $table_element = $object->table_element;
+                $fk_element = $object->id;
+            }
+
+            if (is_object($extObject))
+            {
+                $ext_element = $extObject->element;
+            }
+
+            if (preg_match('/^(string|email|numeric)/',$inputType))
+            {
+                $tmp=explode(':',$inputType);
+                $inputType=$tmp[0];
+                if (! empty($tmp[1])) $inputOption=$tmp[1];
+                if (! empty($tmp[2])) $savemethod=$tmp[2];
+                $out.= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
+            }
+            else if ((preg_match('/^day$/',$inputType)) || (preg_match('/^datepicker/',$inputType)) || (preg_match('/^datehourpicker/',$inputType)))
+            {
+                $tmp=explode(':',$inputType);
+                $inputType=$tmp[0];
+                if (! empty($tmp[1])) $inputOption=$tmp[1];
+                if (! empty($tmp[2])) $savemethod=$tmp[2];
+
+                $out.= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
+            }
+            else if (preg_match('/^(select|autocomplete)/',$inputType))
+            {
+                $tmp=explode(':',$inputType);
+                $inputType=$tmp[0]; $loadmethod=$tmp[1];
+                if (! empty($tmp[2])) $savemethod=$tmp[2];
+                if (! empty($tmp[3])) $button_only=true;
+            }
+            else if (preg_match('/^textarea/',$inputType))
+            {
+                $tmp=explode(':',$inputType);
+                $inputType=$tmp[0];
+                $rows=(empty($tmp[1])?'8':$tmp[1]);
+                $cols=(empty($tmp[2])?'80':$tmp[2]);
+            }
+            else if (preg_match('/^ckeditor/',$inputType))
+            {
+                $tmp=explode(':',$inputType);
+                $inputType=$tmp[0]; $toolbar=$tmp[1];
+                if (! empty($tmp[2])) $width=$tmp[2];
+                if (! empty($tmp[3])) $heigth=$tmp[3];
+                if (! empty($tmp[4])) $savemethod=$tmp[4];
+
+                if (! empty($conf->fckeditor->enabled))
+                {
+                    $out.= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
+                }
+                else
+                {
+                    $inputType = 'textarea';
+                }
+            }
+
+            $out.= '<input id="element_'.$htmlname.'" value="'.$element.'" type="hidden"/>'."\n";
+            $out.= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";
+            $out.= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";
+            $out.= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";
+            if (! empty($savemethod))	$out.= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
+            if (! empty($ext_element))	$out.= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
+            if (! empty($custommsg))
+            {
+                if (is_array($custommsg))
+                {
+                    if (!empty($custommsg['success']))
+                        $out.= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
+                    if (!empty($custommsg['error']))
+                        $out.= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
+                }
+                else
+                    $out.= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+            }
+            if ($inputType == 'textarea') {
+                $out.= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
+                $out.= '<input id="textarea_'.$htmlname.'_cols" value="'.$cols.'" type="hidden"/>'."\n";
+            }
+            $out.= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
+            $out.= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(! empty($editvalue) ? $editvalue : $value).'</span>'."\n";
+        }
+        else
+        {
+            $out = $value;
+        }
+
+        return $out;
+    }
+
+    /**
+     *	Show a text and picto with tooltip on text or picto.
+     *  Can be called by an instancied $form->textwithtooltip or by a static call Form::textwithtooltip
+     *
+     *	@param	string		$text				Text to show
+     *	@param	string		$htmltext			HTML content of tooltip. Must be HTML/UTF8 encoded.
+     *	@param	int			$tooltipon			1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2
+     *	@param	int			$direction			-1=image is before, 0=no image, 1=image is after
+     *	@param	string		$img				Html code for image (use img_xxx() function to get it)
+     *	@param	string		$extracss			Add a CSS style to td tags
+     *	@param	int			$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+     *	@param	string		$incbefore			Include code before the text
+     *	@param	int			$noencodehtmltext	Do not encode into html entity the htmltext
+     *  @param  string      $tooltiptrigger		''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+     *  @param	int			$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
+     *	@return	string							Code html du tooltip (texte+picto)
+     *	@see	Use function textwithpicto if you can.
+     *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
+     */
+    function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger='', $forcenowrap=0)
+    {
+        global $conf;
+
+        if ($incbefore) $text = $incbefore.$text;
+        if (! $htmltext) return $text;
+
+        $tag='td';
+        if ($notabs == 2) $tag='div';
+        if ($notabs == 3) $tag='span';
+        // Sanitize tooltip
+        $htmltext=str_replace("\\","\\\\",$htmltext);
+        $htmltext=str_replace("\r","",$htmltext);
+        $htmltext=str_replace("\n","",$htmltext);
+
+        $extrastyle='';
+        if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-left: 3px !important;'; }
+        if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
+
+        $classfortooltip='classfortooltip';
+
+        $s='';$textfordialog='';
+
+        if ($tooltiptrigger == '')
+        {
+            $htmltext=str_replace('"',"&quot;",$htmltext);
+        }
+        else
+        {
+            $classfortooltip='classfortooltiponclick';
+            $textfordialog.='<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
+        }
+        if ($tooltipon == 2 || $tooltipon == 3)
+        {
+            $paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
+            if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
+            else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
+        }
+        else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
+        if ($tooltipon == 1 || $tooltipon == 3)
+        {
+            $paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
+            if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+            else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
+        }
+        else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
+        if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr style="height: auto;">';
+        elseif ($notabs == 2) $s.='<div class="inline-block'.($forcenowrap?' nowrap':'').'">';
+        // Define value if value is before
+        if ($direction < 0) {
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= ' valign="top" width="14"';
+            }
+            $s.= '>'.$textfordialog.$img.'</'.$tag.'>';
+        }
+        // Use another method to help avoid having a space in value in order to use this value with jquery
+        // Define label
+        if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+        // Define value if value is after
+        if ($direction > 0) {
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') $s .= ' valign="middle" width="14"';
+            $s.= '>'.$textfordialog.$img.'</'.$tag.'>';
+        }
+        if (empty($notabs)) $s.='</tr></table>';
+        elseif ($notabs == 2) $s.='</div>';
+
+        return $s;
+    }
+
+    /**
+     *	Show a text with a picto and a tooltip on picto
+     *
+     *	@param	string	$text				Text to show
+     *	@param  string	$htmltext	     	Content of tooltip
+     *	@param	int		$direction			1=Icon is after text, -1=Icon is before text, 0=no icon
+     * 	@param	string	$type				Type of picto ('info', 'help', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath
+     *  @param  string	$extracss           Add a CSS style to td, div or span tag
+     *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
+     *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+     *  @param  string  $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+     *  @param	int		$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
+     * 	@return	string						HTML code of text, picto, tooltip
+     */
+    function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='', $forcenowrap=0)
+    {
+        global $conf, $langs;
+
+        $alt = '';
+        if ($tooltiptrigger) $alt=$langs->transnoentitiesnoconv("ClickToShowHelp");
+
+        //For backwards compatibility
+        if ($type == '0') $type = 'info';
+        elseif ($type == '1') $type = 'help';
+
+        // If info or help with no javascript, show only text
+        if (empty($conf->use_javascript_ajax))
+        {
+            if ($type == 'info' || $type == 'help')	return $text;
+            else
+            {
+                $alt = $htmltext;
+                $htmltext = '';
+            }
+        }
+
+        // If info or help with smartphone, show only text (tooltip hover can't works)
+        if (! empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
+        {
+            if ($type == 'info' || $type == 'help') return $text;
+        }
+        // If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone)
+        if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
+        {
+            if ($type == 'info' || $type == 'help') return $text;
+        }
+
+        if ($type == 'info') $img = img_help(0, $alt);
+        elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+        elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
+        elseif ($type == 'admin') $img = img_picto($alt, 'star');
+        elseif ($type == 'warning') $img = img_warning($alt);
+        else $img = img_picto($alt, $type);
+
+        return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && ! $img)?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
+    }
+
+    /**
+     * Generate select HTML to choose massaction
+     *
+     * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
+     * @param	int		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
+     * @param   int     $alwaysvisible  1=select button always visible
+     * @return	string					Select list
+     */
+    function selectMassAction($selected, $arrayofaction, $alwaysvisible=0)
+    {
+        global $conf,$langs,$hookmanager;
+
+        if (count($arrayofaction) == 0) return;
+
+        $disabled=0;
+        $ret='<div class="centpercent center">';
+        $ret.='<select class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
+
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
+        if (empty($reshook))
+        {
+            $ret.='<option value="0"'.($disabled?' disabled="disabled"':'').'>-- '.$langs->trans("SelectAction").' --</option>';
+            foreach($arrayofaction as $code => $label)
+            {
+                $ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
+            }
+        }
+        $ret.=$hookmanager->resPrint;
+
+        $ret.='</select>';
+        // Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
+        $ret.='<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">';	// Hidden button BEFORE so it is the one used when we submit with ENTER.
+        $ret.='<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+        $ret.='</div>';
+
+        if (! empty($conf->use_javascript_ajax))
+        {
+            $ret.='<!-- JS CODE TO ENABLE mass action select -->
     		<script type="text/javascript">
         		function initCheckForSelect(mode)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkbox */
         		{
@@ -657,1266 +657,1266 @@ 
         	});
     		</script>
         	';
-		}
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return combo list of activated countries, into language of user
-	 *
-	 *  @param	string	$selected       	Id or Code or Label of preselected country
-	 *  @param  string	$htmlname       	Name of html select object
-	 *  @param  string	$htmloption     	Options html on select object
-	 *  @param	integer	$maxlength			Max length for labels (0=no limit)
-	 *  @param	string	$morecss			More css class
-	 *  @param	string	$usecodeaskey		''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
-	 *  @param	int		$showempty			Show empty choice
-	 *  @param	int		$disablefavorites	1=Disable favorites,
-	 *  @param	int		$addspecialentries	1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
-	 *  @return string           			HTML string with select
-	 */
-	function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1, $disablefavorites=0, $addspecialentries=0)
-	{
+    /**
+     *  Return combo list of activated countries, into language of user
+     *
+     *  @param	string	$selected       	Id or Code or Label of preselected country
+     *  @param  string	$htmlname       	Name of html select object
+     *  @param  string	$htmloption     	Options html on select object
+     *  @param	integer	$maxlength			Max length for labels (0=no limit)
+     *  @param	string	$morecss			More css class
+     *  @param	string	$usecodeaskey		''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+     *  @param	int		$showempty			Show empty choice
+     *  @param	int		$disablefavorites	1=Disable favorites,
+     *  @param	int		$addspecialentries	1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
+     *  @return string           			HTML string with select
+     */
+    function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1, $disablefavorites=0, $addspecialentries=0)
+    {
         // phpcs:enable
-		global $conf,$langs,$mysoc;
-
-		$langs->load("dict");
-
-		$out='';
-		$countryArray=array();
-		$favorite=array();
-		$label=array();
-		$atleastonefavorite=0;
-
-		$sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE active > 0";
-		//$sql.= " ORDER BY code ASC";
-
-		dol_syslog(get_class($this)."::select_country", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$out.= '<select id="select'.$htmlname.'" class="flat maxwidth200onsmartphone selectcountry'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" '.$htmloption.'>';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				$foundselected=false;
-
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$countryArray[$i]['rowid'] 		= $obj->rowid;
-					$countryArray[$i]['code_iso'] 	= $obj->code_iso;
-					$countryArray[$i]['code_iso3'] 	= $obj->code_iso3;
-					$countryArray[$i]['label']		= ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:''));
-					$countryArray[$i]['favorite']   = $obj->favorite;
-					$favorite[$i]					= $obj->favorite;
-					$label[$i] = dol_string_unaccent($countryArray[$i]['label']);
-					$i++;
-				}
-
-				if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
-				else $countryArray = dol_sort_array($countryArray, 'label');
-
-				if ($showempty)
-				{
-					$out.='<option value="">&nbsp;</option>'."\n";
-				}
-
-				if ($addspecialentries)	// Add dedicated entries for groups of countries
-				{
-					//if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
-					$out.= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
-					$out.= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';
-					if ($mysoc->isInEEC()) $out.= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
-					$out.= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';
-					$out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
-				}
-
-				foreach ($countryArray as $row)
-				{
-					//if (empty($showempty) && empty($row['rowid'])) continue;
-					if (empty($row['rowid'])) continue;
-
-					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;
-					if (empty($row['favorite']) && $atleastonefavorite)
-					{
-						$atleastonefavorite=0;
-						$out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
-					}
-					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) )
-					{
-						$foundselected=true;
-						$out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'">';
-					}
-					if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
-					else $out.= '&nbsp;';
-					if ($row['code_iso']) $out.= ' ('.$row['code_iso'] . ')';
-					$out.= '</option>';
-				}
-			}
-			$out.= '</select>';
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		// Make select dynamic
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-		$out .= ajax_combobox('select'.$htmlname);
-
-		return $out;
-	}
+        global $conf,$langs,$mysoc;
+
+        $langs->load("dict");
+
+        $out='';
+        $countryArray=array();
+        $favorite=array();
+        $label=array();
+        $atleastonefavorite=0;
+
+        $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_country";
+        $sql.= " WHERE active > 0";
+        //$sql.= " ORDER BY code ASC";
+
+        dol_syslog(get_class($this)."::select_country", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $out.= '<select id="select'.$htmlname.'" class="flat maxwidth200onsmartphone selectcountry'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" '.$htmloption.'>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                $foundselected=false;
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $countryArray[$i]['rowid'] 		= $obj->rowid;
+                    $countryArray[$i]['code_iso'] 	= $obj->code_iso;
+                    $countryArray[$i]['code_iso3'] 	= $obj->code_iso3;
+                    $countryArray[$i]['label']		= ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:''));
+                    $countryArray[$i]['favorite']   = $obj->favorite;
+                    $favorite[$i]					= $obj->favorite;
+                    $label[$i] = dol_string_unaccent($countryArray[$i]['label']);
+                    $i++;
+                }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return select list of incoterms
-	 *
-	 *  @param	string	$selected       		Id or Code of preselected incoterm
-	 *  @param	string	$location_incoterms     Value of input location
-	 *  @param	string	$page       			Defined the form action
-	 *  @param  string	$htmlname       		Name of html select object
-	 *  @param  string	$htmloption     		Options html on select object
-	 * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
-	 *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 *  @return string           				HTML string with select and input
-	 */
-	function select_incoterms($selected='', $location_incoterms='', $page='', $htmlname='incoterm_id', $htmloption='', $forcecombo=1, $events=array())
-	{
-        // phpcs:enable
-		global $conf,$langs;
-
-		$langs->load("dict");
-
-		$out='';
-		$incotermArray=array();
-
-		$sql = "SELECT rowid, code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_incoterms";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY code ASC";
-
-		dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($conf->use_javascript_ajax && ! $forcecombo)
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events);
-			}
-
-			if (!empty($page))
-			{
-				$out .= '<form method="post" action="'.$page.'">';
-				$out .= '<input type="hidden" name="action" value="set_incoterms">';
-				$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			}
-
-			$out.= '<select id="'.$htmlname.'" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
-			$out.= '<option value="0">&nbsp;</option>';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				$foundselected=false;
-
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$incotermArray[$i]['rowid'] = $obj->rowid;
-					$incotermArray[$i]['code'] = $obj->code;
-					$i++;
-				}
-
-				foreach ($incotermArray as $row)
-				{
-					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
-					{
-						$out.= '<option value="'.$row['rowid'].'" selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.$row['rowid'].'">';
-					}
+                if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+                else $countryArray = dol_sort_array($countryArray, 'label');
 
-					if ($row['code']) $out.= $row['code'];
+                if ($showempty)
+                {
+                    $out.='<option value="">&nbsp;</option>'."\n";
+                }
 
-					$out.= '</option>';
-				}
-			}
-			$out.= '</select>';
+                if ($addspecialentries)	// Add dedicated entries for groups of countries
+                {
+                    //if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+                    $out.= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+                    $out.= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';
+                    if ($mysoc->isInEEC()) $out.= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+                    $out.= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';
+                    $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+                }
 
-			$out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="'.$location_incoterms.'">';
+                foreach ($countryArray as $row)
+                {
+                    //if (empty($showempty) && empty($row['rowid'])) continue;
+                    if (empty($row['rowid'])) continue;
 
-			if (!empty($page))
-			{
-				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
+                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;
+                    if (empty($row['favorite']) && $atleastonefavorite)
+                    {
+                        $atleastonefavorite=0;
+                        $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+                    }
+                    if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) )
+                    {
+                        $foundselected=true;
+                        $out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'">';
+                    }
+                    if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
+                    else $out.= '&nbsp;';
+                    if ($row['code_iso']) $out.= ' ('.$row['code_iso'] . ')';
+                    $out.= '</option>';
+                }
+            }
+            $out.= '</select>';
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
 
-		return $out;
-	}
+        // Make select dynamic
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        $out .= ajax_combobox('select'.$htmlname);
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of types of lines (product or service)
-	 * 	Example: 0=product, 1=service, 9=other (for external module)
-	 *
-	 *	@param  string	$selected       Preselected type
-	 *	@param  string	$htmlname       Name of field in html form
-	 * 	@param	int		$showempty		Add an empty field
-	 * 	@param	int		$hidetext		Do not show label 'Type' before combo box (used only if there is at least 2 choices to select)
-	 * 	@param	integer	$forceall		1=Force to show products and services in combo list, whatever are activated modules, 0=No force, 2=Force to show only Products, 3=Force to show only services, -1=Force none (and set hidden field to 'service')
-	 *  @return	void
-	 */
-	function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0)
-	{
-        // phpcs:enable
-		global $db,$langs,$user,$conf;
-
-		// If product & services are enabled or both disabled.
-		if ($forceall == 1 || (empty($forceall) && ! empty($conf->product->enabled) && ! empty($conf->service->enabled))
-		|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)) )
-		{
-			if (empty($hidetext)) print $langs->trans("Type").': ';
-			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($showempty)
-			{
-				print '<option value="-1"';
-				if ($selected == -1) print ' selected';
-				print '>&nbsp;</option>';
-			}
-
-			print '<option value="0"';
-			if (0 == $selected) print ' selected';
-			print '>'.$langs->trans("Product");
-
-			print '<option value="1"';
-			if (1 == $selected) print ' selected';
-			print '>'.$langs->trans("Service");
-
-			print '</select>';
-			//if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		if ((empty($forceall) && empty($conf->product->enabled) && ! empty($conf->service->enabled)) || $forceall == 3)
-		{
-			print $langs->trans("Service");
-			print '<input type="hidden" name="'.$htmlname.'" value="1">';
-		}
-		if ((empty($forceall) && ! empty($conf->product->enabled) && empty($conf->service->enabled)) || $forceall == 2)
-		{
-			print $langs->trans("Product");
-			print '<input type="hidden" name="'.$htmlname.'" value="0">';
-		}
-		if ($forceall < 0)	// This should happened only for contracts when both predefined product and service are disabled.
-		{
-			print '<input type="hidden" name="'.$htmlname.'" value="1">';	// By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
-		}
-	}
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Load into cache cache_types_fees, array of types of fees
-	 *
-	 *	@return     int             Nb of lines loaded, <0 if KO
-	 */
-	function load_cache_types_fees()
-	{
+    /**
+     *  Return select list of incoterms
+     *
+     *  @param	string	$selected       		Id or Code of preselected incoterm
+     *  @param	string	$location_incoterms     Value of input location
+     *  @param	string	$page       			Defined the form action
+     *  @param  string	$htmlname       		Name of html select object
+     *  @param  string	$htmloption     		Options html on select object
+     * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
+     *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @return string           				HTML string with select and input
+     */
+    function select_incoterms($selected='', $location_incoterms='', $page='', $htmlname='incoterm_id', $htmloption='', $forcecombo=1, $events=array())
+    {
         // phpcs:enable
-		global $langs;
-
-		$num = count($this->cache_types_fees);
-		if ($num > 0) return 0;    // Cache already loaded
+        global $conf,$langs;
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
+        $langs->load("dict");
 
-		$langs->load("trips");
+        $out='';
+        $incotermArray=array();
 
-		$sql = "SELECT c.code, c.label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-		$sql.= " WHERE active > 0";
+        $sql = "SELECT rowid, code";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_incoterms";
+        $sql.= " WHERE active > 0";
+        $sql.= " ORDER BY code ASC";
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
+        dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($conf->use_javascript_ajax && ! $forcecombo)
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname, $events);
+            }
 
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
+            if (!empty($page))
+            {
+                $out .= '<form method="post" action="'.$page.'">';
+                $out .= '<input type="hidden" name="action" value="set_incoterms">';
+                $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            }
 
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label=($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label));
-				$this->cache_types_fees[$obj->code] = $label;
-				$i++;
-			}
+            $out.= '<select id="'.$htmlname.'" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
+            $out.= '<option value="0">&nbsp;</option>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                $foundselected=false;
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $incotermArray[$i]['rowid'] = $obj->rowid;
+                    $incotermArray[$i]['code'] = $obj->code;
+                    $i++;
+                }
 
-			asort($this->cache_types_fees);
+                foreach ($incotermArray as $row)
+                {
+                    if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
+                    {
+                        $out.= '<option value="'.$row['rowid'].'" selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.$row['rowid'].'">';
+                    }
 
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+                    if ($row['code']) $out.= $row['code'];
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of types of notes
-	 *
-	 *	@param	string		$selected		Preselected type
-	 *	@param  string		$htmlname		Name of field in form
-	 * 	@param	int			$showempty		Add an empty field
-	 * 	@return	void
-	 */
-	function select_type_fees($selected='',$htmlname='type',$showempty=0)
-	{
-        // phpcs:enable
-		global $user, $langs;
+                    $out.= '</option>';
+                }
+            }
+            $out.= '</select>';
 
-		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
+            $out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="'.$location_incoterms.'">';
 
-		$this->load_cache_types_fees();
+            if (!empty($page))
+            {
+                $out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
 
-		print '<select id="select_'.$htmlname.'" class="flat" name="'.$htmlname.'">';
-		if ($showempty)
-		{
-			print '<option value="-1"';
-			if ($selected == -1) print ' selected';
-			print '>&nbsp;</option>';
-		}
+        return $out;
+    }
 
-		foreach($this->cache_types_fees as $key => $value)
-		{
-			print '<option value="'.$key.'"';
-			if ($key == $selected) print ' selected';
-			print '>';
-			print $value;
-			print '</option>';
-		}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Return list of types of lines (product or service)
+     * 	Example: 0=product, 1=service, 9=other (for external module)
+     *
+     *	@param  string	$selected       Preselected type
+     *	@param  string	$htmlname       Name of field in html form
+     * 	@param	int		$showempty		Add an empty field
+     * 	@param	int		$hidetext		Do not show label 'Type' before combo box (used only if there is at least 2 choices to select)
+     * 	@param	integer	$forceall		1=Force to show products and services in combo list, whatever are activated modules, 0=No force, 2=Force to show only Products, 3=Force to show only services, -1=Force none (and set hidden field to 'service')
+     *  @return	void
+     */
+    function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0)
+    {
+        // phpcs:enable
+        global $db,$langs,$user,$conf;
+
+        // If product & services are enabled or both disabled.
+        if ($forceall == 1 || (empty($forceall) && ! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+        || (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)) )
+        {
+            if (empty($hidetext)) print $langs->trans("Type").': ';
+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+            if ($showempty)
+            {
+                print '<option value="-1"';
+                if ($selected == -1) print ' selected';
+                print '>&nbsp;</option>';
+            }
 
-		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	}
+            print '<option value="0"';
+            if (0 == $selected) print ' selected';
+            print '>'.$langs->trans("Product");
 
+            print '<option value="1"';
+            if (1 == $selected) print ' selected';
+            print '>'.$langs->trans("Service");
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return HTML code to select a company.
-	 *
-	 *  @param		int			$selected				Preselected products
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
-	 *  @param		int			$filter					Filter on thirdparty
-	 *  @param		int			$limit					Limit on number of returned lines
-	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
-	 * 	@param		int			$forcecombo				Force to load all values and output a standard combobox (with no beautification)
-	 *  @return		string								Return select box for thirdparty.
-	 *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)
-	 */
-	function select_thirdparty($selected='', $htmlname='socid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
-	{
-        // phpcs:enable
-   		return $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0, $limit);
-	}
+            print '</select>';
+            //if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
+        if ((empty($forceall) && empty($conf->product->enabled) && ! empty($conf->service->enabled)) || $forceall == 3)
+        {
+            print $langs->trans("Service");
+            print '<input type="hidden" name="'.$htmlname.'" value="1">';
+        }
+        if ((empty($forceall) && ! empty($conf->product->enabled) && empty($conf->service->enabled)) || $forceall == 2)
+        {
+            print $langs->trans("Product");
+            print '<input type="hidden" name="'.$htmlname.'" value="0">';
+        }
+        if ($forceall < 0)	// This should happened only for contracts when both predefined product and service are disabled.
+        {
+            print '<input type="hidden" name="'.$htmlname.'" value="1">';	// By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Output html form to select a third party
-	 *
-	 *	@param	string	$selected       		Preselected type
-	 *	@param  string	$htmlname       		Name of field in form
-	 *  @param  string	$filter         		optional filters criteras (example: 's.rowid <> x', 's.client IN (1,3)')
-	 *	@param	string	$showempty				Add an empty field (Can be '1' or text key to use on empty line like 'SelectThirdParty')
-	 * 	@param	int		$showtype				Show third party type in combolist (customer, prospect or supplier)
-	 * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
-	 *  @param	array	$events					Ajax event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 *	@param	int		$limit					Maximum number of elements
-	 *  @param	string	$morecss				Add more css styles to the SELECT component
-	 *	@param  string	$moreparam      		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
-	 *	@param	string	$selected_input_value	Value of preselected input text (for use with ajax)
-	 *  @param	int		$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
-	 *  @param	array	$ajaxoptions			Options for ajax_autocompleter
-	 * 	@param  bool	$multiple				add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
-	 * 	@return	string							HTML string with select box for thirdparty.
-	 */
-	function select_company($selected='', $htmlname='socid', $filter='', $showempty='', $showtype=0, $forcecombo=0, $events=array(), $limit=0, $morecss='minwidth100', $moreparam='', $selected_input_value='', $hidelabel=1, $ajaxoptions=array(), $multiple=false)
-	{
+    /**
+     *	Load into cache cache_types_fees, array of types of fees
+     *
+     *	@return     int             Nb of lines loaded, <0 if KO
+     */
+    function load_cache_types_fees()
+    {
         // phpcs:enable
-		global $conf,$user,$langs;
-
-		$out='';
-
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
-		{
-			// No immediate load of all database
-			$placeholder='';
-			if ($selected && empty($selected_input_value))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-				$societetmp = new Societe($this->db);
-				$societetmp->fetch($selected);
-				$selected_input_value=$societetmp->name;
-				unset($societetmp);
-			}
-			// mode 1
-			$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype?'&showtype='.$showtype:'');
-			$out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-			$out.='<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
-			else if ($hidelabel > 1) {
-				$placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
-				if ($hidelabel == 2) {
-					$out.=  img_picto($langs->trans("Search"), 'search');
-				}
-			}
-			$out.= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
-			if ($hidelabel == 3) {
-				$out.=  img_picto($langs->trans("Search"), 'search');
-			}
-		}
-		else
-		{
-			// Immediate load of all database
-			$out.=$this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
-		}
-
-		return $out;
-	}
+        global $langs;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Output html form to select a third party.
-	 *  Note, you must use the select_company to get the component to select a third party. This function must only be called by select_company.
-	 *
-	 *	@param	string	$selected       Preselected type
-	 *	@param  string	$htmlname       Name of field in form
-	 *  @param  string	$filter         Optional filters criteras (example: 's.rowid <> x', 's.client in (1,3)')
-	 *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line like 'SelectThirdParty')
-	 * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
-	 * 	@param	int		$forcecombo		Force to use standard HTML select component without beautification
-	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 *  @param	string	$filterkey		Filter on key value
-	 *  @param	int		$outputmode		0=HTML select string, 1=Array
-	 *  @param	int		$limit			Limit number of answers
-	 *  @param	string	$morecss		Add more css styles to the SELECT component
-	 *	@param  string	$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
-	 *	@param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
-	 * 	@return	string					HTML string with
-	 */
-	function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty='', $showtype=0, $forcecombo=0, $events=array(), $filterkey='', $outputmode=0, $limit=0, $morecss='minwidth100', $moreparam='', $multiple=false)
-	{
-        // phpcs:enable
-		global $conf,$user,$langs;
-
-		$out='';
-		$num=0;
-		$outarray=array();
-
-		if ($selected === '') $selected = array();
-		else if (!is_array($selected)) $selected = array($selected);
-
-		// Clean $filter that may contains sql conditions so sql code
-		if (function_exists('testSqlAndScriptInject')) {
-			if (testSqlAndScriptInject($filter, 3)>0) {
-				$filter ='';
-			}
-		}
-
-		// On recherche les societes
-		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-
-		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-			$sql .= " ,s.address, s.zip, s.town";
-		 	$sql .= " , dictp.code as country_code";
-		}
-
-		$sql.= " FROM (".MAIN_DB_PREFIX ."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " )";
-		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-			$sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
-		}
-		$sql.= " WHERE s.entity IN (".getEntity('societe').")";
-		if (! empty($user->socid)) $sql.= " AND s.rowid = ".$user->socid;
-		if ($filter) $sql.= " AND (".$filter.")";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if (! empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND s.status <> 0";
-		// Add criteria
-		if ($filterkey && $filterkey != '')
-		{
-			$sql.=" AND (";
-			$prefix=empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on
-			// For natural search
-			$scrit = explode(' ', $filterkey);
-			$i=0;
-			if (count($scrit) > 1) $sql.="(";
-			foreach ($scrit as $crit) {
-				if ($i > 0) $sql.=" AND ";
-				$sql.="(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";
-				$i++;
-			}
-			if (count($scrit) > 1) $sql.=")";
-			if (! empty($conf->barcode->enabled))
-			{
-				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-			}
-			$sql.= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-			$sql.=")";
-		}
-		$sql.=$this->db->order("nom","ASC");
-		$sql.=$this->db->plimit($limit, 0);
-
-		// Build output string
-		dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-		   	if (! $forcecombo)
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
-			}
-
-			// Construct $out and $outarray
-			$out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparam?' '.$moreparam:'').' name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";
-
-			$textifempty='';
-			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
-			{
-				if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
-				else $textifempty.=$langs->trans("All");
-			}
-			if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$label='';
-					if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {
-						if (($obj->client) && (!empty($obj->code_client))) {
-							$label = $obj->code_client. ' - ';
-						}
-						if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) {
-							$label .= $obj->code_fournisseur. ' - ';
-						}
-						$label.=' '.$obj->name;
-					}
-					else
-					{
-						$label=$obj->name;
-					}
+        $num = count($this->cache_types_fees);
+        if ($num > 0) return 0;    // Cache already loaded
 
-					if(!empty($obj->name_alias)) {
-						$label.=' ('.$obj->name_alias.')';
-					}
+        dol_syslog(__METHOD__, LOG_DEBUG);
 
-					if ($showtype)
-					{
-						if ($obj->client || $obj->fournisseur) $label.=' (';
-						if ($obj->client == 1 || $obj->client == 3) $label.=$langs->trans("Customer");
-						if ($obj->client == 2 || $obj->client == 3) $label.=($obj->client==3?', ':'').$langs->trans("Prospect");
-						if ($obj->fournisseur) $label.=($obj->client?', ':'').$langs->trans("Supplier");
-						if ($obj->client || $obj->fournisseur) $label.=')';
-					}
+        $langs->load("trips");
 
-					if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-						$label.='-'.$obj->address.'-'. $obj->zip.' '. $obj->town;
-						if (!empty($obj->country_code)) {
-							$label.= ' '. $langs->trans('Country'.$obj->country_code);
-						}
-					}
+        $sql = "SELECT c.code, c.label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+        $sql.= " WHERE active > 0";
 
-					if (empty($outputmode))
-					{
-						if (in_array($obj->rowid,$selected))
-						{
-							$out.= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
-							$out.= '<option value="'.$obj->rowid.'">'.$label.'</option>';
-						}
-					}
-					else
-					{
-						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
-					}
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
 
-					$i++;
-					if (($i % 10) == 0) $out.="\n";
-				}
-			}
-			$out.= '</select>'."\n";
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
 
-		$this->result=array('nbofthirdparties'=>$num);
+                // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                $label=($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label));
+                $this->cache_types_fees[$obj->code] = $label;
+                $i++;
+            }
 
-		if ($outputmode) return $outarray;
-		return $out;
-	}
+            asort($this->cache_types_fees);
 
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Return HTML combo list of absolute discounts
-	 *
-	 *    	@param	string	$selected       Id remise fixe pre-selectionnee
-	 *    	@param  string	$htmlname       Nom champ formulaire
-	 *    	@param  string	$filter         Criteres optionnels de filtre
-	 * 		@param	int		$socid			Id of thirdparty
-	 * 		@param	int		$maxvalue		Max value for lines that can be selected
-	 * 		@return	int						Return number of qualifed lines in list
-	 */
-	function select_remises($selected, $htmlname, $filter, $socid, $maxvalue=0)
-	{
+    /**
+     *	Return list of types of notes
+     *
+     *	@param	string		$selected		Preselected type
+     *	@param  string		$htmlname		Name of field in form
+     * 	@param	int			$showempty		Add an empty field
+     * 	@return	void
+     */
+    function select_type_fees($selected='',$htmlname='type',$showempty=0)
+    {
         // phpcs:enable
-		global $langs,$conf;
-
-		// On recherche les remises
-		$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-		$sql.= " re.description, re.fk_facture_source";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re";
-		$sql.= " WHERE re.fk_soc = ".(int) $socid;
-		$sql.= " AND re.entity = " . $conf->entity;
-		if ($filter) $sql.= " AND ".$filter;
-		$sql.= " ORDER BY re.description ASC";
-
-		dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			print '<select id="select_'.$htmlname.'" class="flat maxwidthonsmartphone" name="'.$htmlname.'">';
-			$num = $this->db->num_rows($resql);
-
-			$qualifiedlines=$num;
-
-			$i = 0;
-			if ($num)
-			{
-				print '<option value="0">&nbsp;</option>';
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$desc=dol_trunc($obj->description,40);
-					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc=preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
-					if (preg_match('/\(DEPOSIT\)/', $desc)) $desc=preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
-					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc=preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
-					if (preg_match('/\(EXCESS PAID\)/', $desc)) $desc=preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
-
-					$selectstring='';
-					if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected';
-
-					$disabled='';
-					if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue)
-					{
-						$qualifiedlines--;
-						$disabled=' disabled';
-					}
+        global $user, $langs;
 
-					if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source))
-					{
-						$tmpfac = new Facture($this->db);
-						if ($tmpfac->fetch($obj->fk_facture_source) > 0) $desc=$desc.' - '.$tmpfac->ref;
-					}
+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
-					print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';
-					$i++;
-				}
-			}
-			print '</select>';
-			return $qualifiedlines;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+        $this->load_cache_types_fees();
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of all contacts (for a third party or all)
-	 *
-	 *	@param	int		$socid      	Id ot third party or 0 for all
-	 *	@param  string	$selected   	Id contact pre-selectionne
-	 *	@param  string	$htmlname  	    Name of HTML field ('none' for a not editable field)
-	 *	@param  int		$showempty      0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
-	 *	@param  string	$exclude        List of contacts id to exclude
-	 *	@param	string	$limitto		Disable answers that are not id in this array list
-	 *	@param	integer	$showfunction   Add function into label
-	 *	@param	string	$moreclass		Add more class to class style
-	 *	@param	integer	$showsoc	    Add company into label
-	 * 	@param	int		$forcecombo		Force to use combo box
-	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 *  @param	bool	$options_only	Return options only (for ajax treatment)
-	 *  @param	string	$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
-	 *  @param	string	$htmlid			Html id to use instead of htmlname
-	 *	@return	int						<0 if KO, Nb of contact in list if OK
-	 *  @deprected						You can use selectcontacts directly (warning order of param was changed)
-	 */
-	function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0, $forcecombo=0, $events=array(), $options_only=false, $moreparam='', $htmlid='')
-	{
-        // phpcs:enable
-		print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
-		return $this->num;
-	}
-
-	/**
-	 *	Return HTML code of the SELECT of list of all contacts (for a third party or all).
-	 *  This also set the number of contacts found into $this->num
-	 *
-	 * @since 9.0 Add afterSelectContactOptions hook
-	 *
-	 *	@param	int			$socid      	Id ot third party or 0 for all or -1 for empty list
-	 *	@param  array|int	$selected   	Array of ID of pre-selected contact id
-	 *	@param  string		$htmlname  	    Name of HTML field ('none' for a not editable field)
-	 *	@param  int			$showempty     	0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
-	 *	@param  string		$exclude        List of contacts id to exclude
-	 *	@param	string		$limitto		Disable answers that are not id in this array list
-	 *	@param	integer		$showfunction   Add function into label
-	 *	@param	string		$moreclass		Add more class to class style
-	 *	@param	bool		$options_only	Return options only (for ajax treatment)
-	 *	@param	integer		$showsoc	    Add company into label
-	 * 	@param	int			$forcecombo		Force to use combo box (so no ajax beautify effect)
-	 *  @param	array		$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 *  @param	string		$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
-	 *  @param	string		$htmlid			Html id to use instead of htmlname
-	 *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut
-	 *	@return	 int						<0 if KO, Nb of contact in list if OK
-	 */
-	function selectcontacts($socid, $selected='', $htmlname='contactid', $showempty=0, $exclude='', $limitto='', $showfunction=0, $moreclass='', $options_only=false, $showsoc=0, $forcecombo=0, $events=array(), $moreparam='', $htmlid='', $multiple=false)
-	{
-		global $conf,$langs,$hookmanager,$action;
-
-		$langs->load('companies');
-
-		if (empty($htmlid)) $htmlid = $htmlname;
-
-		if ($selected === '') $selected = array();
-		else if (!is_array($selected)) $selected = array($selected);
-		$out='';
-
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-
-		// We search third parties
-		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
-		if ($showsoc > 0) $sql.= " , s.nom as company";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
-		if ($showsoc > 0) $sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
-		$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-		if ($socid > 0 || $socid == -1) $sql.= " AND sp.fk_soc=".$socid;
-		if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut <> 0";
-		$sql.= " ORDER BY sp.lastname ASC";
-
-		dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-
-			if ($conf->use_javascript_ajax && ! $forcecombo && ! $options_only)
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
-			}
-
-			if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
-			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out.= '<option value="0"'.(in_array(0,$selected)?' selected':'').'>&nbsp;</option>';
-			if ($showempty == 2) $out.= '<option value="0"'.(in_array(0,$selected)?' selected':'').'>'.$langs->trans("Internal").'</option>';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-				$contactstatic=new Contact($this->db);
-
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					$contactstatic->id=$obj->rowid;
-					$contactstatic->lastname=$obj->lastname;
-					$contactstatic->firstname=$obj->firstname;
-					if ($obj->statut == 1){
-					if ($htmlname != 'none')
-					{
-						$disabled=0;
-						if (is_array($exclude) && count($exclude) && in_array($obj->rowid,$exclude)) $disabled=1;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
-						if (!empty($selected) && in_array($obj->rowid, $selected))
-						{
-							$out.= '<option value="'.$obj->rowid.'"';
-							if ($disabled) $out.= ' disabled';
-							$out.= ' selected>';
-							$out.= $contactstatic->getFullName($langs);
-							if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
-							if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
-							$out.= '</option>';
-						}
-						else
-						{
-							$out.= '<option value="'.$obj->rowid.'"';
-							if ($disabled) $out.= ' disabled';
-							$out.= '>';
-							$out.= $contactstatic->getFullName($langs);
-							if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
-							if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
-							$out.= '</option>';
-						}
-					}
-					else
-					{
-						if (in_array($obj->rowid, $selected))
-						{
-							$out.= $contactstatic->getFullName($langs);
-							if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
-							if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
-						}
-					}
-				}
-					$i++;
-				}
-			}
-			else
-			{
-				$out.= '<option value="-1"'.(($showempty==2 || $multiple) ? '' : ' selected').' disabled>';
-				$out.= ($socid != -1) ? ($langs->trans($socid?"NoContactDefinedForThirdParty":"NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
-				$out.= '</option>';
-			}
-
-			$parameters = array(
-				'socid'=>$socid,
-				'htmlname'=>$htmlname,
-				'resql'=>$resql,
-				'out'=>&$out,
-				'showfunction'=>$showfunction,
-				'showsoc'=>$showsoc,
-			);
-
-			$reshook = $hookmanager->executeHooks( 'afterSelectContactOptions', $parameters, $this, $action );    // Note that $action and $object may have been modified by some hooks
-
-			if ($htmlname != 'none' || $options_only)
-			{
-				$out.= '</select>';
-			}
-
-			$this->num = $num;
-			return $out;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+        print '<select id="select_'.$htmlname.'" class="flat" name="'.$htmlname.'">';
+        if ($showempty)
+        {
+            print '<option value="-1"';
+            if ($selected == -1) print ' selected';
+            print '>&nbsp;</option>';
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return select list of users
-	 *
-	 *  @param	string	$selected       Id user preselected
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
-	 *  @param  array	$exclude        Array list of users id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  array	$include        Array list of users id to include
-	 * 	@param	int		$enableonly		Array list of users id to be enabled. All other must be disabled
-	 *  @param	string	$force_entity	'0' or Ids of environment to force
-	 * 	@return	void
-	 *  @deprecated		Use select_dolusers instead
-	 *  @see select_dolusers()
-	 */
-	function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude=null,$disabled=0,$include='',$enableonly='',$force_entity='0')
-	{
-        // phpcs:enable
-		print $this->select_dolusers($selected,$htmlname,$show_empty,$exclude,$disabled,$include,$enableonly,$force_entity);
-	}
+        foreach($this->cache_types_fees as $key => $value)
+        {
+            print '<option value="'.$key.'"';
+            if ($key == $selected) print ' selected';
+            print '>';
+            print $value;
+            print '</option>';
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return select list of users
-	 *
-	 *  @param	string	$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=list with no empty value, 1=add also an empty value into list
-	 *  @param  array	$exclude        Array list of users id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  array|string	$include        Array list of users id to include or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
-	 * 	@param	array	$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled
-	 *  @param	string	$force_entity	'0' or Ids of environment to force
-	 *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
-	 *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	string	$morefilter		Add more filters into sql request (Example: 'employee = 1')
-	 *  @param	integer	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
-	 *  @param	string	$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
-	 *  @param	string	$morecss		More css
-	 *  @param  int     $noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
-	 *  @param  int		$outputmode     0=HTML select string, 1=Array
-	 *  @param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
-	 * 	@return	string					HTML select string
-	 *  @see select_dolgroups
-	 */
-	function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0, $outputmode=0, $multiple=false)
-	{
+        print '</select>';
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Return HTML code to select a company.
+     *
+     *  @param		int			$selected				Preselected products
+     *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
+     *  @param		int			$filter					Filter on thirdparty
+     *  @param		int			$limit					Limit on number of returned lines
+     *  @param		array		$ajaxoptions			Options for ajax_autocompleter
+     * 	@param		int			$forcecombo				Force to load all values and output a standard combobox (with no beautification)
+     *  @return		string								Return select box for thirdparty.
+     *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)
+     */
+    function select_thirdparty($selected='', $htmlname='socid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
+    {
         // phpcs:enable
-		global $conf,$user,$langs;
-
-		// If no preselected user defined, we take current user
-		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id;
-
-		if ($selected === '') $selected = array();
-		else if (!is_array($selected)) $selected = array($selected);
-
-		$excludeUsers=null;
-		$includeUsers=null;
-
-		// Permettre l'exclusion d'utilisateurs
-		if (is_array($exclude))	$excludeUsers = implode(",",$exclude);
-		// Permettre l'inclusion d'utilisateurs
-		if (is_array($include))	$includeUsers = implode(",",$include);
-		else if ($include == 'hierarchy')
-		{
-			// Build list includeUsers to have only hierarchy
-			$includeUsers = implode(",",$user->getAllChildIds(0));
-		}
-		else if ($include == 'hierarchyme')
-		{
-			// Build list includeUsers to have only hierarchy and current user
-			$includeUsers = implode(",",$user->getAllChildIds(1));
-		}
-
-		$out='';
-		$outarray = array();
-
-		// Forge request to select users
-		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		{
-			$sql.= ", e.label";
-		}
-		$sql.= " FROM ".MAIN_DB_PREFIX ."user as u";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."entity as e ON e.rowid=u.entity";
-			if ($force_entity) $sql.= " WHERE u.entity IN (0,".$force_entity.")";
-			else $sql.= " WHERE u.entity IS NOT NULL";
-		}
-		else
-		{
-			if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-			{
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
-				$sql.= " ON ug.fk_user = u.rowid";
-				$sql.= " WHERE ug.entity = ".$conf->entity;
-			}
-			else
-			{
-				$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
-			}
-		}
-		if (! empty($user->societe_id)) $sql.= " AND u.fk_soc = ".$user->societe_id;
-		if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN (".$excludeUsers.")";
-		if ($includeUsers) $sql.= " AND u.rowid IN (".$includeUsers.")";
-		if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql.= " AND u.statut <> 0";
-		if (! empty($morefilter)) $sql.=" ".$morefilter;
-
-		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
-		{
-			$sql.= " ORDER BY u.firstname ASC";
-		}
-		else
-		{
-			$sql.= " ORDER BY u.lastname ASC";
-		}
-
-		dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-		   		// Enhance with select2
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname);
-
-				// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
-				$out.= '<select class="flat'.($morecss?' minwidth100 '.$morecss:' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled?' disabled':'').'>';
-				if ($show_empty && !$multiple) $out.= '<option value="-1"'.((empty($selected) || in_array(-1,$selected))?' selected':'').'>&nbsp;</option>'."\n";
-				if ($show_every) $out.= '<option value="-2"'.((in_array(-2,$selected))?' selected':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
-
-				$userstatic=new User($this->db);
-
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					$userstatic->id=$obj->rowid;
-					$userstatic->lastname=$obj->lastname;
-					$userstatic->firstname=$obj->firstname;
-
-					$disableline='';
-					if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=($enableonlytext?$enableonlytext:'1');
-
-					if ((is_object($selected) && $selected->id == $obj->rowid) || (! is_object($selected) && in_array($obj->rowid,$selected) ))
-					{
-						$out.= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out.= ' disabled';
-						$out.= ' selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out.= ' disabled';
-						$out.= '>';
-					}
+            return $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0, $limit);
+    }
 
-					// $fullNameMode is 0=Lastname+Firstname (MAIN_FIRSTNAME_NAME_POSITION=1), 1=Firstname+Lastname (MAIN_FIRSTNAME_NAME_POSITION=0)
-					$fullNameMode = 0;
-					if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))
-					{
-						$fullNameMode = 1; //Firstname+lastname
-					}
-					$out.= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
-
-					// Complete name with more info
-					$moreinfo=0;
-					if (! empty($conf->global->MAIN_SHOW_LOGIN))
-					{
-						$out.= ($moreinfo?' - ':' (').$obj->login;
-						$moreinfo++;
-					}
-					if ($showstatus >= 0)
-					{
-						if ($obj->statut == 1 && $showstatus == 1)
-						{
-							$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
-							$moreinfo++;
-						}
-						if ($obj->statut == 0)
-						{
-							$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
-							$moreinfo++;
-						}
-					}
-					if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
-					{
-						if (! $obj->entity)
-						{
-							$out.=($moreinfo?' - ':' (').$langs->trans("AllEntities");
-							$moreinfo++;
-						}
-						else
-						{
-							$out.=($moreinfo?' - ':' (').($obj->label?$obj->label:$langs->trans("EntityNameNotDefined"));
-							$moreinfo++;
-					 	}
-					}
-					$out.=($moreinfo?')':'');
-					if ($disableline && $disableline != '1')
-					{
-						$out.=' - '.$disableline;	// This is text from $enableonlytext parameter
-					}
-					$out.= '</option>';
-					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
-
-					$i++;
-				}
-			}
-			else
-			{
-				$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
-				$out.= '<option value="">'.$langs->trans("None").'</option>';
-			}
-			$out.= '</select>';
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		if ($outputmode) return $outarray;
-		return $out;
-	}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Output html form to select a third party
+     *
+     *	@param	string	$selected       		Preselected type
+     *	@param  string	$htmlname       		Name of field in form
+     *  @param  string	$filter         		optional filters criteras (example: 's.rowid <> x', 's.client IN (1,3)')
+     *	@param	string	$showempty				Add an empty field (Can be '1' or text key to use on empty line like 'SelectThirdParty')
+     * 	@param	int		$showtype				Show third party type in combolist (customer, prospect or supplier)
+     * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
+     *  @param	array	$events					Ajax event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *	@param	int		$limit					Maximum number of elements
+     *  @param	string	$morecss				Add more css styles to the SELECT component
+     *	@param  string	$moreparam      		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+     *	@param	string	$selected_input_value	Value of preselected input text (for use with ajax)
+     *  @param	int		$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
+     *  @param	array	$ajaxoptions			Options for ajax_autocompleter
+     * 	@param  bool	$multiple				add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
+     * 	@return	string							HTML string with select box for thirdparty.
+     */
+    function select_company($selected='', $htmlname='socid', $filter='', $showempty='', $showtype=0, $forcecombo=0, $events=array(), $limit=0, $morecss='minwidth100', $moreparam='', $selected_input_value='', $hidelabel=1, $ajaxoptions=array(), $multiple=false)
+    {
+        // phpcs:enable
+        global $conf,$user,$langs;
+
+        $out='';
+
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
+        {
+            // No immediate load of all database
+            $placeholder='';
+            if ($selected && empty($selected_input_value))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+                $societetmp = new Societe($this->db);
+                $societetmp->fetch($selected);
+                $selected_input_value=$societetmp->name;
+                unset($societetmp);
+            }
+            // mode 1
+            $urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype?'&showtype='.$showtype:'');
+            $out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+            $out.='<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
+            if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
+            else if ($hidelabel > 1) {
+                $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
+                if ($hidelabel == 2) {
+                    $out.=  img_picto($langs->trans("Search"), 'search');
+                }
+            }
+            $out.= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+            if ($hidelabel == 3) {
+                $out.=  img_picto($langs->trans("Search"), 'search');
+            }
+        }
+        else
+        {
+            // Immediate load of all database
+            $out.=$this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
+        }
+
+        return $out;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Output html form to select a third party.
+     *  Note, you must use the select_company to get the component to select a third party. This function must only be called by select_company.
+     *
+     *	@param	string	$selected       Preselected type
+     *	@param  string	$htmlname       Name of field in form
+     *  @param  string	$filter         Optional filters criteras (example: 's.rowid <> x', 's.client in (1,3)')
+     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line like 'SelectThirdParty')
+     * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
+     * 	@param	int		$forcecombo		Force to use standard HTML select component without beautification
+     *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @param	string	$filterkey		Filter on key value
+     *  @param	int		$outputmode		0=HTML select string, 1=Array
+     *  @param	int		$limit			Limit number of answers
+     *  @param	string	$morecss		Add more css styles to the SELECT component
+     *	@param  string	$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+     *	@param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
+     * 	@return	string					HTML string with
+     */
+    function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty='', $showtype=0, $forcecombo=0, $events=array(), $filterkey='', $outputmode=0, $limit=0, $morecss='minwidth100', $moreparam='', $multiple=false)
+    {
+        // phpcs:enable
+        global $conf,$user,$langs;
+
+        $out='';
+        $num=0;
+        $outarray=array();
+
+        if ($selected === '') $selected = array();
+        else if (!is_array($selected)) $selected = array($selected);
+
+        // Clean $filter that may contains sql conditions so sql code
+        if (function_exists('testSqlAndScriptInject')) {
+            if (testSqlAndScriptInject($filter, 3)>0) {
+                $filter ='';
+            }
+        }
+
+        // On recherche les societes
+        $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+
+        if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
+            $sql .= " ,s.address, s.zip, s.town";
+                $sql .= " , dictp.code as country_code";
+        }
+
+        $sql.= " FROM (".MAIN_DB_PREFIX ."societe as s";
+        if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= " )";
+        if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
+            $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
+        }
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
+        if (! empty($user->socid)) $sql.= " AND s.rowid = ".$user->socid;
+        if ($filter) $sql.= " AND (".$filter.")";
+        if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        if (! empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND s.status <> 0";
+        // Add criteria
+        if ($filterkey && $filterkey != '')
+        {
+            $sql.=" AND (";
+            $prefix=empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on
+            // For natural search
+            $scrit = explode(' ', $filterkey);
+            $i=0;
+            if (count($scrit) > 1) $sql.="(";
+            foreach ($scrit as $crit) {
+                if ($i > 0) $sql.=" AND ";
+                $sql.="(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";
+                $i++;
+            }
+            if (count($scrit) > 1) $sql.=")";
+            if (! empty($conf->barcode->enabled))
+            {
+                $sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+            }
+            $sql.= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+            $sql.=")";
+        }
+        $sql.=$this->db->order("nom","ASC");
+        $sql.=$this->db->plimit($limit, 0);
+
+        // Build output string
+        dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+                if (! $forcecombo)
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+            }
+
+            // Construct $out and $outarray
+            $out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparam?' '.$moreparam:'').' name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";
+
+            $textifempty='';
+            // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+            //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+            if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+            {
+                if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
+                else $textifempty.=$langs->trans("All");
+            }
+            if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $label='';
+                    if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {
+                        if (($obj->client) && (!empty($obj->code_client))) {
+                            $label = $obj->code_client. ' - ';
+                        }
+                        if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) {
+                            $label .= $obj->code_fournisseur. ' - ';
+                        }
+                        $label.=' '.$obj->name;
+                    }
+                    else
+                    {
+                        $label=$obj->name;
+                    }
+
+                    if(!empty($obj->name_alias)) {
+                        $label.=' ('.$obj->name_alias.')';
+                    }
+
+                    if ($showtype)
+                    {
+                        if ($obj->client || $obj->fournisseur) $label.=' (';
+                        if ($obj->client == 1 || $obj->client == 3) $label.=$langs->trans("Customer");
+                        if ($obj->client == 2 || $obj->client == 3) $label.=($obj->client==3?', ':'').$langs->trans("Prospect");
+                        if ($obj->fournisseur) $label.=($obj->client?', ':'').$langs->trans("Supplier");
+                        if ($obj->client || $obj->fournisseur) $label.=')';
+                    }
+
+                    if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
+                        $label.='-'.$obj->address.'-'. $obj->zip.' '. $obj->town;
+                        if (!empty($obj->country_code)) {
+                            $label.= ' '. $langs->trans('Country'.$obj->country_code);
+                        }
+                    }
+
+                    if (empty($outputmode))
+                    {
+                        if (in_array($obj->rowid,$selected))
+                        {
+                            $out.= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
+                        }
+                        else
+                        {
+                            $out.= '<option value="'.$obj->rowid.'">'.$label.'</option>';
+                        }
+                    }
+                    else
+                    {
+                        array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
+                    }
+
+                    $i++;
+                    if (($i % 10) == 0) $out.="\n";
+                }
+            }
+            $out.= '</select>'."\n";
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        $this->result=array('nbofthirdparties'=>$num);
+
+        if ($outputmode) return $outarray;
+        return $out;
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    	Return HTML combo list of absolute discounts
+     *
+     *    	@param	string	$selected       Id remise fixe pre-selectionnee
+     *    	@param  string	$htmlname       Nom champ formulaire
+     *    	@param  string	$filter         Criteres optionnels de filtre
+     * 		@param	int		$socid			Id of thirdparty
+     * 		@param	int		$maxvalue		Max value for lines that can be selected
+     * 		@return	int						Return number of qualifed lines in list
+     */
+    function select_remises($selected, $htmlname, $filter, $socid, $maxvalue=0)
+    {
+        // phpcs:enable
+        global $langs,$conf;
+
+        // On recherche les remises
+        $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+        $sql.= " re.description, re.fk_facture_source";
+        $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re";
+        $sql.= " WHERE re.fk_soc = ".(int) $socid;
+        $sql.= " AND re.entity = " . $conf->entity;
+        if ($filter) $sql.= " AND ".$filter;
+        $sql.= " ORDER BY re.description ASC";
+
+        dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            print '<select id="select_'.$htmlname.'" class="flat maxwidthonsmartphone" name="'.$htmlname.'">';
+            $num = $this->db->num_rows($resql);
+
+            $qualifiedlines=$num;
+
+            $i = 0;
+            if ($num)
+            {
+                print '<option value="0">&nbsp;</option>';
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $desc=dol_trunc($obj->description,40);
+                    if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc=preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
+                    if (preg_match('/\(DEPOSIT\)/', $desc)) $desc=preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc=preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+                    if (preg_match('/\(EXCESS PAID\)/', $desc)) $desc=preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+
+                    $selectstring='';
+                    if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected';
+
+                    $disabled='';
+                    if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue)
+                    {
+                        $qualifiedlines--;
+                        $disabled=' disabled';
+                    }
+
+                    if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source))
+                    {
+                        $tmpfac = new Facture($this->db);
+                        if ($tmpfac->fetch($obj->fk_facture_source) > 0) $desc=$desc.' - '.$tmpfac->ref;
+                    }
+
+                    print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';
+                    $i++;
+                }
+            }
+            print '</select>';
+            return $qualifiedlines;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Return list of all contacts (for a third party or all)
+     *
+     *	@param	int		$socid      	Id ot third party or 0 for all
+     *	@param  string	$selected   	Id contact pre-selectionne
+     *	@param  string	$htmlname  	    Name of HTML field ('none' for a not editable field)
+     *	@param  int		$showempty      0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
+     *	@param  string	$exclude        List of contacts id to exclude
+     *	@param	string	$limitto		Disable answers that are not id in this array list
+     *	@param	integer	$showfunction   Add function into label
+     *	@param	string	$moreclass		Add more class to class style
+     *	@param	integer	$showsoc	    Add company into label
+     * 	@param	int		$forcecombo		Force to use combo box
+     *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @param	bool	$options_only	Return options only (for ajax treatment)
+     *  @param	string	$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+     *  @param	string	$htmlid			Html id to use instead of htmlname
+     *	@return	int						<0 if KO, Nb of contact in list if OK
+     *  @deprected						You can use selectcontacts directly (warning order of param was changed)
+     */
+    function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0, $forcecombo=0, $events=array(), $options_only=false, $moreparam='', $htmlid='')
+    {
+        // phpcs:enable
+        print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
+        return $this->num;
+    }
+
+    /**
+     *	Return HTML code of the SELECT of list of all contacts (for a third party or all).
+     *  This also set the number of contacts found into $this->num
+     *
+     * @since 9.0 Add afterSelectContactOptions hook
+     *
+     *	@param	int			$socid      	Id ot third party or 0 for all or -1 for empty list
+     *	@param  array|int	$selected   	Array of ID of pre-selected contact id
+     *	@param  string		$htmlname  	    Name of HTML field ('none' for a not editable field)
+     *	@param  int			$showempty     	0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
+     *	@param  string		$exclude        List of contacts id to exclude
+     *	@param	string		$limitto		Disable answers that are not id in this array list
+     *	@param	integer		$showfunction   Add function into label
+     *	@param	string		$moreclass		Add more class to class style
+     *	@param	bool		$options_only	Return options only (for ajax treatment)
+     *	@param	integer		$showsoc	    Add company into label
+     * 	@param	int			$forcecombo		Force to use combo box (so no ajax beautify effect)
+     *  @param	array		$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @param	string		$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+     *  @param	string		$htmlid			Html id to use instead of htmlname
+     *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut
+     *	@return	 int						<0 if KO, Nb of contact in list if OK
+     */
+    function selectcontacts($socid, $selected='', $htmlname='contactid', $showempty=0, $exclude='', $limitto='', $showfunction=0, $moreclass='', $options_only=false, $showsoc=0, $forcecombo=0, $events=array(), $moreparam='', $htmlid='', $multiple=false)
+    {
+        global $conf,$langs,$hookmanager,$action;
+
+        $langs->load('companies');
+
+        if (empty($htmlid)) $htmlid = $htmlname;
+
+        if ($selected === '') $selected = array();
+        else if (!is_array($selected)) $selected = array($selected);
+        $out='';
+
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+
+        // We search third parties
+        $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
+        if ($showsoc > 0) $sql.= " , s.nom as company";
+        $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
+        if ($showsoc > 0) $sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
+        $sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
+        if ($socid > 0 || $socid == -1) $sql.= " AND sp.fk_soc=".$socid;
+        if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut <> 0";
+        $sql.= " ORDER BY sp.lastname ASC";
+
+        dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+
+            if ($conf->use_javascript_ajax && ! $forcecombo && ! $options_only)
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+            }
+
+            if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out.= '<option value="0"'.(in_array(0,$selected)?' selected':'').'>&nbsp;</option>';
+            if ($showempty == 2) $out.= '<option value="0"'.(in_array(0,$selected)?' selected':'').'>'.$langs->trans("Internal").'</option>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+                $contactstatic=new Contact($this->db);
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    $contactstatic->id=$obj->rowid;
+                    $contactstatic->lastname=$obj->lastname;
+                    $contactstatic->firstname=$obj->firstname;
+                    if ($obj->statut == 1){
+                    if ($htmlname != 'none')
+                    {
+                        $disabled=0;
+                        if (is_array($exclude) && count($exclude) && in_array($obj->rowid,$exclude)) $disabled=1;
+                        if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+                        if (!empty($selected) && in_array($obj->rowid, $selected))
+                        {
+                            $out.= '<option value="'.$obj->rowid.'"';
+                            if ($disabled) $out.= ' disabled';
+                            $out.= ' selected>';
+                            $out.= $contactstatic->getFullName($langs);
+                            if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
+                            if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
+                            $out.= '</option>';
+                        }
+                        else
+                        {
+                            $out.= '<option value="'.$obj->rowid.'"';
+                            if ($disabled) $out.= ' disabled';
+                            $out.= '>';
+                            $out.= $contactstatic->getFullName($langs);
+                            if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
+                            if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
+                            $out.= '</option>';
+                        }
+                    }
+                    else
+                    {
+                        if (in_array($obj->rowid, $selected))
+                        {
+                            $out.= $contactstatic->getFullName($langs);
+                            if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
+                            if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
+                        }
+                    }
+                }
+                    $i++;
+                }
+            }
+            else
+            {
+                $out.= '<option value="-1"'.(($showempty==2 || $multiple) ? '' : ' selected').' disabled>';
+                $out.= ($socid != -1) ? ($langs->trans($socid?"NoContactDefinedForThirdParty":"NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
+                $out.= '</option>';
+            }
+
+            $parameters = array(
+                'socid'=>$socid,
+                'htmlname'=>$htmlname,
+                'resql'=>$resql,
+                'out'=>&$out,
+                'showfunction'=>$showfunction,
+                'showsoc'=>$showsoc,
+            );
+
+            $reshook = $hookmanager->executeHooks( 'afterSelectContactOptions', $parameters, $this, $action );    // Note that $action and $object may have been modified by some hooks
+
+            if ($htmlname != 'none' || $options_only)
+            {
+                $out.= '</select>';
+            }
+
+            $this->num = $num;
+            return $out;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Return select list of users
+     *
+     *  @param	string	$selected       Id user preselected
+     *  @param  string	$htmlname       Field name in form
+     *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
+     *  @param  array	$exclude        Array list of users id to exclude
+     * 	@param	int		$disabled		If select list must be disabled
+     *  @param  array	$include        Array list of users id to include
+     * 	@param	int		$enableonly		Array list of users id to be enabled. All other must be disabled
+     *  @param	string	$force_entity	'0' or Ids of environment to force
+     * 	@return	void
+     *  @deprecated		Use select_dolusers instead
+     *  @see select_dolusers()
+     */
+    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude=null,$disabled=0,$include='',$enableonly='',$force_entity='0')
+    {
+        // phpcs:enable
+        print $this->select_dolusers($selected,$htmlname,$show_empty,$exclude,$disabled,$include,$enableonly,$force_entity);
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Return select list of users
+     *
+     *  @param	string	$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
+     *  @param  string	$htmlname       Field name in form
+     *  @param  int		$show_empty     0=list with no empty value, 1=add also an empty value into list
+     *  @param  array	$exclude        Array list of users id to exclude
+     * 	@param	int		$disabled		If select list must be disabled
+     *  @param  array|string	$include        Array list of users id to include or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
+     * 	@param	array	$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled
+     *  @param	string	$force_entity	'0' or Ids of environment to force
+     *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
+     *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+     *  @param	string	$morefilter		Add more filters into sql request (Example: 'employee = 1')
+     *  @param	integer	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
+     *  @param	string	$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
+     *  @param	string	$morecss		More css
+     *  @param  int     $noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
+     *  @param  int		$outputmode     0=HTML select string, 1=Array
+     *  @param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
+     * 	@return	string					HTML select string
+     *  @see select_dolgroups
+     */
+    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0, $outputmode=0, $multiple=false)
+    {
+        // phpcs:enable
+        global $conf,$user,$langs;
+
+        // If no preselected user defined, we take current user
+        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id;
+
+        if ($selected === '') $selected = array();
+        else if (!is_array($selected)) $selected = array($selected);
+
+        $excludeUsers=null;
+        $includeUsers=null;
+
+        // Permettre l'exclusion d'utilisateurs
+        if (is_array($exclude))	$excludeUsers = implode(",",$exclude);
+        // Permettre l'inclusion d'utilisateurs
+        if (is_array($include))	$includeUsers = implode(",",$include);
+        else if ($include == 'hierarchy')
+        {
+            // Build list includeUsers to have only hierarchy
+            $includeUsers = implode(",",$user->getAllChildIds(0));
+        }
+        else if ($include == 'hierarchyme')
+        {
+            // Build list includeUsers to have only hierarchy and current user
+            $includeUsers = implode(",",$user->getAllChildIds(1));
+        }
+
+        $out='';
+        $outarray = array();
+
+        // Forge request to select users
+        $sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
+        if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
+        {
+            $sql.= ", e.label";
+        }
+        $sql.= " FROM ".MAIN_DB_PREFIX ."user as u";
+        if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."entity as e ON e.rowid=u.entity";
+            if ($force_entity) $sql.= " WHERE u.entity IN (0,".$force_entity.")";
+            else $sql.= " WHERE u.entity IS NOT NULL";
+        }
+        else
+        {
+            if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+            {
+                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
+                $sql.= " ON ug.fk_user = u.rowid";
+                $sql.= " WHERE ug.entity = ".$conf->entity;
+            }
+            else
+            {
+                $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+            }
+        }
+        if (! empty($user->societe_id)) $sql.= " AND u.fk_soc = ".$user->societe_id;
+        if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN (".$excludeUsers.")";
+        if ($includeUsers) $sql.= " AND u.rowid IN (".$includeUsers.")";
+        if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql.= " AND u.statut <> 0";
+        if (! empty($morefilter)) $sql.=" ".$morefilter;
+
+        if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
+        {
+            $sql.= " ORDER BY u.firstname ASC";
+        }
+        else
+        {
+            $sql.= " ORDER BY u.lastname ASC";
+        }
+
+        dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                    // Enhance with select2
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname);
+
+                // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
+                $out.= '<select class="flat'.($morecss?' minwidth100 '.$morecss:' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled?' disabled':'').'>';
+                if ($show_empty && !$multiple) $out.= '<option value="-1"'.((empty($selected) || in_array(-1,$selected))?' selected':'').'>&nbsp;</option>'."\n";
+                if ($show_every) $out.= '<option value="-2"'.((in_array(-2,$selected))?' selected':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
+
+                $userstatic=new User($this->db);
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    $userstatic->id=$obj->rowid;
+                    $userstatic->lastname=$obj->lastname;
+                    $userstatic->firstname=$obj->firstname;
+
+                    $disableline='';
+                    if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=($enableonlytext?$enableonlytext:'1');
+
+                    if ((is_object($selected) && $selected->id == $obj->rowid) || (! is_object($selected) && in_array($obj->rowid,$selected) ))
+                    {
+                        $out.= '<option value="'.$obj->rowid.'"';
+                        if ($disableline) $out.= ' disabled';
+                        $out.= ' selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.$obj->rowid.'"';
+                        if ($disableline) $out.= ' disabled';
+                        $out.= '>';
+                    }
+
+                    // $fullNameMode is 0=Lastname+Firstname (MAIN_FIRSTNAME_NAME_POSITION=1), 1=Firstname+Lastname (MAIN_FIRSTNAME_NAME_POSITION=0)
+                    $fullNameMode = 0;
+                    if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))
+                    {
+                        $fullNameMode = 1; //Firstname+lastname
+                    }
+                    $out.= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
+
+                    // Complete name with more info
+                    $moreinfo=0;
+                    if (! empty($conf->global->MAIN_SHOW_LOGIN))
+                    {
+                        $out.= ($moreinfo?' - ':' (').$obj->login;
+                        $moreinfo++;
+                    }
+                    if ($showstatus >= 0)
+                    {
+                        if ($obj->statut == 1 && $showstatus == 1)
+                        {
+                            $out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+                            $moreinfo++;
+                        }
+                        if ($obj->statut == 0)
+                        {
+                            $out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+                            $moreinfo++;
+                        }
+                    }
+                    if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    {
+                        if (! $obj->entity)
+                        {
+                            $out.=($moreinfo?' - ':' (').$langs->trans("AllEntities");
+                            $moreinfo++;
+                        }
+                        else
+                        {
+                            $out.=($moreinfo?' - ':' (').($obj->label?$obj->label:$langs->trans("EntityNameNotDefined"));
+                            $moreinfo++;
+                            }
+                    }
+                    $out.=($moreinfo?')':'');
+                    if ($disableline && $disableline != '1')
+                    {
+                        $out.=' - '.$disableline;	// This is text from $enableonlytext parameter
+                    }
+                    $out.= '</option>';
+                    $outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
+
+                    $i++;
+                }
+            }
+            else
+            {
+                $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
+                $out.= '<option value="">'.$langs->trans("None").'</option>';
+            }
+            $out.= '</select>';
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        if ($outputmode) return $outarray;
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return select list of users. Selected users are stored into session.
-	 *  List of users are provided into $_SESSION['assignedtouser'].
-	 *
-	 *  @param  string	$action         Value for $action
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=list without the empty value, 1=add empty value
-	 *  @param  array	$exclude        Array list of users id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  array	$include        Array list of users id to include or 'hierarchy' to have only supervised users
-	 * 	@param	array	$enableonly		Array list of users id to be enabled. All other must be disabled
-	 *  @param	int		$force_entity	'0' or Ids of environment to force
-	 *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
-	 *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	string	$morefilter		Add more filters into sql request
-	 *  @param	int		$showproperties		Show properties of each attendees
-	 *  @param	array	$listofuserid		Array with properties of each user
-	 *  @param	array	$listofcontactid	Array with properties of each contact
-	 *  @param	array	$listofotherid		Array with properties of each other contact
-	 * 	@return	string					HTML select string
-	 *  @see select_dolgroups
-	 */
-	function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $showproperties=0, $listofuserid=array(), $listofcontactid=array(), $listofotherid=array())
-	{
+    /**
+     *	Return select list of users. Selected users are stored into session.
+     *  List of users are provided into $_SESSION['assignedtouser'].
+     *
+     *  @param  string	$action         Value for $action
+     *  @param  string	$htmlname       Field name in form
+     *  @param  int		$show_empty     0=list without the empty value, 1=add empty value
+     *  @param  array	$exclude        Array list of users id to exclude
+     * 	@param	int		$disabled		If select list must be disabled
+     *  @param  array	$include        Array list of users id to include or 'hierarchy' to have only supervised users
+     * 	@param	array	$enableonly		Array list of users id to be enabled. All other must be disabled
+     *  @param	int		$force_entity	'0' or Ids of environment to force
+     *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
+     *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+     *  @param	string	$morefilter		Add more filters into sql request
+     *  @param	int		$showproperties		Show properties of each attendees
+     *  @param	array	$listofuserid		Array with properties of each user
+     *  @param	array	$listofcontactid	Array with properties of each contact
+     *  @param	array	$listofotherid		Array with properties of each other contact
+     * 	@return	string					HTML select string
+     *  @see select_dolgroups
+     */
+    function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $showproperties=0, $listofuserid=array(), $listofcontactid=array(), $listofotherid=array())
+    {
         // phpcs:enable
-		global $conf, $user, $langs;
-
-		$userstatic=new User($this->db);
-		$out='';
-
-		// Method with no ajax
-		//$out.='<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		if ($action == 'view')
-		{
-			$out.='';
-		}
-		else
-		{
-			$out.='<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
-			$out.='<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
-			$out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
-			$out.=' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
-			$out.='<br>';
-		}
-		$assignedtouser=array();
-		if (!empty($_SESSION['assignedtouser']))
-		{
-			$assignedtouser=json_decode($_SESSION['assignedtouser'], true);
-		}
-		$nbassignetouser=count($assignedtouser);
-
-		if ($nbassignetouser && $action != 'view') $out.='<br>';
-		if ($nbassignetouser) $out.='<ul class="attendees">';
-		$i=0; $ownerid=0;
-		foreach($assignedtouser as $key => $value)
-		{
-			if ($value['id'] == $ownerid) continue;
-
-			$out.='<li>';
-			$userstatic->fetch($value['id']);
-			$out.= $userstatic->getNomUrl(-1);
-			if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; }
-			if ($nbassignetouser > 1 && $action != 'view')
-			{
-				$out.=' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
-			}
-			// Show my availability
-			if ($showproperties)
-			{
-				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))
-				{
-					$out.='<div class="myavailability inline-block">';
-					$out.='&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view'?'disabled':'').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency']?' checked':'').'>'.$langs->trans("Busy");
-					$out.='</div>';
-				}
-			}
-			//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
-			//$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy"));
-
-			$out.='</li>';
-			$i++;
-		}
-		if ($nbassignetouser) $out.='</ul>';
-
-		//$out.='</form>';
-		return $out;
-	}
+        global $conf, $user, $langs;
+
+        $userstatic=new User($this->db);
+        $out='';
+
+        // Method with no ajax
+        //$out.='<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        if ($action == 'view')
+        {
+            $out.='';
+        }
+        else
+        {
+            $out.='<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
+            $out.='<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
+            $out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
+            $out.=' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+            $out.='<br>';
+        }
+        $assignedtouser=array();
+        if (!empty($_SESSION['assignedtouser']))
+        {
+            $assignedtouser=json_decode($_SESSION['assignedtouser'], true);
+        }
+        $nbassignetouser=count($assignedtouser);
+
+        if ($nbassignetouser && $action != 'view') $out.='<br>';
+        if ($nbassignetouser) $out.='<ul class="attendees">';
+        $i=0; $ownerid=0;
+        foreach($assignedtouser as $key => $value)
+        {
+            if ($value['id'] == $ownerid) continue;
+
+            $out.='<li>';
+            $userstatic->fetch($value['id']);
+            $out.= $userstatic->getNomUrl(-1);
+            if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; }
+            if ($nbassignetouser > 1 && $action != 'view')
+            {
+                $out.=' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
+            }
+            // Show my availability
+            if ($showproperties)
+            {
+                if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))
+                {
+                    $out.='<div class="myavailability inline-block">';
+                    $out.='&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view'?'disabled':'').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency']?' checked':'').'>'.$langs->trans("Busy");
+                    $out.='</div>';
+                }
+            }
+            //$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
+            //$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy"));
+
+            $out.='</li>';
+            $i++;
+        }
+        if ($nbassignetouser) $out.='</ul>';
+
+        //$out.='</form>';
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
-	 *
-	 *  @param		int			$selected				Preselected products
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
-	 *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
-	 *  @param		int			$limit					Limit on number of returned lines
-	 *  @param		int			$price_level			Level of price to show
-	 *  @param		int			$status					Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell
-	 *  @param		int			$finished				2=all, 1=finished, 0=raw material
-	 *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
-	 *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
-	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
-	 *  @param      int			$socid					Thirdparty Id (to get also price dedicated to this customer)
-	 *  @param		string		$showempty				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
-	 * 	@param		int			$forcecombo				Force to use combo box
-	 *  @param      string      $morecss                Add more css on select
-	 *  @param      int         $hidepriceinlabel       1=Hide prices in label
-	 *  @param      string      $warehouseStatus        warehouse status filter, following comma separated filter options can be used
-	 *										            'warehouseopen' = select products from open warehouses,
-	 *										            'warehouseclosed' = select products from closed warehouses,
-	 *										            'warehouseinternal' = select products from warehouses for internal correct/transfer only
-	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
-	 *  @return		void
-	 */
-	function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $showempty='1', $forcecombo=0, $morecss='', $hidepriceinlabel=0, $warehouseStatus='', $selected_combinations = array())
-	{
+    /**
+     *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
+     *
+     *  @param		int			$selected				Preselected products
+     *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
+     *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
+     *  @param		int			$limit					Limit on number of returned lines
+     *  @param		int			$price_level			Level of price to show
+     *  @param		int			$status					Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell
+     *  @param		int			$finished				2=all, 1=finished, 0=raw material
+     *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
+     *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
+     *  @param		array		$ajaxoptions			Options for ajax_autocompleter
+     *  @param      int			$socid					Thirdparty Id (to get also price dedicated to this customer)
+     *  @param		string		$showempty				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+     * 	@param		int			$forcecombo				Force to use combo box
+     *  @param      string      $morecss                Add more css on select
+     *  @param      int         $hidepriceinlabel       1=Hide prices in label
+     *  @param      string      $warehouseStatus        warehouse status filter, following comma separated filter options can be used
+     *										            'warehouseopen' = select products from open warehouses,
+     *										            'warehouseclosed' = select products from closed warehouses,
+     *										            'warehouseinternal' = select products from warehouses for internal correct/transfer only
+     *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
+     *  @return		void
+     */
+    function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $showempty='1', $forcecombo=0, $morecss='', $hidepriceinlabel=0, $warehouseStatus='', $selected_combinations = array())
+    {
         // phpcs:enable
-		global $langs,$conf;
-
-		$price_level = (! empty($price_level) ? $price_level : 0);
-
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
-		{
-			$placeholder='';
-
-			if ($selected && empty($selected_input_value))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-				$producttmpselect = new Product($this->db);
-				$producttmpselect->fetch($selected);
-				$selected_input_value=$producttmpselect->ref;
-				unset($producttmpselect);
-			}
-			// mode=1 means customers products
-			$urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
-			//Price by customer
-			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
-				$urloption.='&socid='.$socid;
-			}
-			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-
-			if (!empty($conf->variants->enabled)) {
-				?>
+        global $langs,$conf;
+
+        $price_level = (! empty($price_level) ? $price_level : 0);
+
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+        {
+            $placeholder='';
+
+            if ($selected && empty($selected_input_value))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                $producttmpselect = new Product($this->db);
+                $producttmpselect->fetch($selected);
+                $selected_input_value=$producttmpselect->ref;
+                unset($producttmpselect);
+            }
+            // mode=1 means customers products
+            $urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
+            //Price by customer
+            if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+                $urloption.='&socid='.$socid;
+            }
+            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+
+            if (!empty($conf->variants->enabled)) {
+                ?>
 				<script>
 
 					selected = <?php echo json_encode($selected_combinations) ?>;
@@ -1987,3871 +1987,3871 @@ 
 					});
 				</script>
                 <?php
-			}
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
-			else if ($hidelabel > 1) {
-				$placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
-				if ($hidelabel == 2) {
-					print img_picto($langs->trans("Search"), 'search');
-				}
-			}
-			print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
-			if ($hidelabel == 3) {
-				print img_picto($langs->trans("Search"), 'search');
-			}
-		}
-		else
-		{
-			print $this->select_produits_list($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0,$socid,$showempty,$forcecombo,$morecss,$hidepriceinlabel, $warehouseStatus);
-		}
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of products for a customer
-	 *
-	 *	@param      int		$selected           Preselected product
-	 *	@param      string	$htmlname           Name of select html
-	 *  @param		string	$filtertype         Filter on product type (''=nofilter, 0=product, 1=service)
-	 *	@param      int		$limit              Limit on number of returned lines
-	 *	@param      int		$price_level        Level of price to show
-	 * 	@param      string	$filterkey          Filter on product
-	 *	@param		int		$status             -1=Return all products, 0=Products not on sell, 1=Products on sell
-	 *  @param      int		$finished           Filter on finished field: 2=No filter
-	 *  @param      int		$outputmode         0=HTML select string, 1=Array
-	 *  @param      int		$socid     		    Thirdparty Id (to get also price dedicated to this customer)
-	 *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
-	 * 	@param		int		$forcecombo		    Force to use combo box
-	 *  @param      string  $morecss            Add more css on select
-	 *  @param      int     $hidepriceinlabel   1=Hide prices in label
-	 *  @param      string  $warehouseStatus    warehouse status filter, following comma separated filter options can be used
-	 *										    'warehouseopen' = select products from open warehouses,
-	 *										    'warehouseclosed' = select products from closed warehouses,
-	 *										    'warehouseinternal' = select products from warehouses for internal correct/transfer only
-	 *  @return     array    				    Array of keys for json
-	 */
-	function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0,$showempty='1',$forcecombo=0,$morecss='',$hidepriceinlabel=0, $warehouseStatus='')
-	{
-        // phpcs:enable
-		global $langs,$conf,$user,$db;
-
-		$out='';
-		$outarray=array();
-
-		$warehouseStatusArray = array();
-		if (! empty($warehouseStatus))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-			if (preg_match('/warehouseclosed/', $warehouseStatus))
-			{
-				$warehouseStatusArray[] = Entrepot::STATUS_CLOSED;
-			}
-			if (preg_match('/warehouseopen/', $warehouseStatus))
-			{
-				$warehouseStatusArray[] = Entrepot::STATUS_OPEN_ALL;
-			}
-			if (preg_match('/warehouseinternal/', $warehouseStatus))
-			{
-				$warehouseStatusArray[] = Entrepot::STATUS_OPEN_INTERNAL;
-			}
-		}
-
-		$selectFields = " p.rowid, p.label, p.ref, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
-		(count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";
-
-		$sql = "SELECT ";
-		$sql.= $selectFields . $selectFieldsGrouped;
-
-		if (! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
-		{
-			//Product category
-			$sql.= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
-						FROM ".MAIN_DB_PREFIX."categorie_product
-						WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid
-						LIMIT 1
-				) AS categorie_product_id ";
-		}
-
-		//Price by customer
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))
-		{
-			$sql.=', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
-			$sql.=' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
-			$selectFields.= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
-		}
-
-		// Multilang : we add translation
-		if (! empty($conf->global->MAIN_MULTILANGS))
-		{
-			$sql.= ", pl.label as label_translated";
-			$selectFields.= ", label_translated";
-		}
-		// Price by quantity
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-		{
-			$sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level;
-			$sql.= " ORDER BY date_price";
-			$sql.= " DESC LIMIT 1) as price_rowid";
-			$sql.= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";	// price_by_qty is 1 if some prices by qty exists in subtable
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level;
-			$sql.= " ORDER BY date_price";
-			$sql.= " DESC LIMIT 1) as price_by_qty";
-			$selectFields.= ", price_rowid, price_by_qty";
-		}
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-		if (count($warehouseStatusArray))
-		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid";
-		}
-
-		// include search in supplier ref
-		if(!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
-		{
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
-		}
-
-		//Price by customer
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
-			$sql.=" LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
-		}
-		// Multilang : we add translation
-		if (! empty($conf->global->MAIN_MULTILANGS))
-		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='". $langs->getDefaultLang() ."'";
-		}
-
-		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
-		}
-
-		$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
-		if (count($warehouseStatusArray))
-		{
-			$sql.= ' AND (p.fk_product_type = 1 OR e.statut IN ('.$this->db->escape(implode(',',$warehouseStatusArray)).'))';
-		}
-
-		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
-			$sql .= " AND pac.rowid IS NULL";
-		}
-
-		if ($finished == 0)
-		{
-			$sql.= " AND p.finished = ".$finished;
-		}
-		elseif ($finished == 1)
-		{
-			$sql.= " AND p.finished = ".$finished;
-			if ($status >= 0)  $sql.= " AND p.tosell = ".$status;
-		}
-		elseif ($status >= 0)
-		{
-			$sql.= " AND p.tosell = ".$status;
-		}
-		if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
-		// Add criteria on ref/label
-		if ($filterkey != '')
-		{
-			$sql.=' AND (';
-			$prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
-			// For natural search
-			$scrit = explode(' ', $filterkey);
-			$i=0;
-			if (count($scrit) > 1) $sql.="(";
-			foreach ($scrit as $crit)
-			{
-				if ($i > 0) $sql.=" AND ";
-				$sql.="(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
-				if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
-				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
-				{
-					$sql.=" OR p.description LIKE '".$db->escape($prefix.$crit)."%'";
-					if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
-				}
-				if (! empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql.=" OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
-				$sql.=")";
-				$i++;
-			}
-			if (count($scrit) > 1) $sql.=")";
-		  	if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
-			$sql.=')';
-		}
-		if (count($warehouseStatusArray))
-		{
-			$sql.= ' GROUP BY'.$selectFields;
-		}
-
-		//Sort by category
-		if(! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
-		{
-			$sql .= " ORDER BY categorie_product_id ";
-			//ASC OR DESC order
-			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .="ASC" : $sql .="DESC";
-		}
-		else
-		{
-			$sql.= $db->order("p.ref");
-		}
-
-		$sql.= $db->plimit($limit, 0);
-
-		// Build output string
-		dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-			require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-			$num = $this->db->num_rows($result);
-
-			$events=null;
-
-			if (! $forcecombo)
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
-			}
-
-			$out.='<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-
-			$textifempty='';
-			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
-			{
-				if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
-				else $textifempty.=$langs->trans("All");
-			}
-			if ($showempty) $out.='<option value="0" selected>'.$textifempty.'</option>';
-
-			$i = 0;
-			while ($num && $i < $num)
-			{
-				$opt = '';
-				$optJson = array();
-				$objp = $this->db->fetch_object($result);
-
-				if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1)
-				{ // Price by quantity will return many prices for the same product
-					$sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";
-					$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-					$sql.= " WHERE fk_product_price=".$objp->price_rowid;
-					$sql.= " ORDER BY quantity ASC";
-
-					dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
-					$result2 = $this->db->query($sql);
-					if ($result2)
-					{
-						$nb_prices = $this->db->num_rows($result2);
-						$j = 0;
-						while ($nb_prices && $j < $nb_prices) {
-							$objp2 = $this->db->fetch_object($result2);
-
-							$objp->price_by_qty_rowid = $objp2->rowid;
-							$objp->price_by_qty_price_base_type = $objp2->price_base_type;
-							$objp->price_by_qty_quantity = $objp2->quantity;
-							$objp->price_by_qty_unitprice = $objp2->unitprice;
-							$objp->price_by_qty_remise_percent = $objp2->remise_percent;
-							// For backward compatibility
-							$objp->quantity = $objp2->quantity;
-							$objp->price = $objp2->price;
-							$objp->unitprice = $objp2->unitprice;
-							$objp->remise_percent = $objp2->remise_percent;
-							$objp->remise = $objp2->remise;
-
-							$this->constructProductListOption($objp, $opt, $optJson, 0, $selected, $hidepriceinlabel);
-
-							$j++;
-
-							// Add new entry
-							// "key" value of json key array is used by jQuery automatically as selected value
-							// "label" value of json key array is used by jQuery automatically as text for combo box
-							$out.=$opt;
-							array_push($outarray, $optJson);
-						}
-					}
-				}
-				else
-				{
-					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
-						$price_product = new Product($this->db);
-						$price_product->fetch($objp->rowid, '', '', 1);
-						$priceparser = new PriceParser($this->db);
-						$price_result = $priceparser->parseProduct($price_product);
-						if ($price_result >= 0) {
-							$objp->price = $price_result;
-							$objp->unitprice = $price_result;
-							//Calculate the VAT
-							$objp->price_ttc = price2num($objp->price) * (1 + ($objp->tva_tx / 100));
-							$objp->price_ttc = price2num($objp->price_ttc,'MU');
-						}
-					}
-					$this->constructProductListOption($objp, $opt, $optJson, $price_level, $selected, $hidepriceinlabel);
-					// Add new entry
-					// "key" value of json key array is used by jQuery automatically as selected value
-					// "label" value of json key array is used by jQuery automatically as text for combo box
-					$out.=$opt;
-					array_push($outarray, $optJson);
-				}
-
-				$i++;
-			}
-
-			$out.='</select>';
-
-			$this->db->free($result);
-
-			if (empty($outputmode)) return $out;
-			return $outarray;
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	/**
-	 * constructProductListOption
-	 *
-	 * @param 	resultset	$objp			    Resultset of fetch
-	 * @param 	string		$opt			    Option (var used for returned value in string option format)
-	 * @param 	string		$optJson		    Option (var used for returned value in json format)
-	 * @param 	int			$price_level	    Price level
-	 * @param 	string		$selected		    Preselected value
-	 * @param   int         $hidepriceinlabel   Hide price in label
-	 * @return	void
-	 */
-	private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel=0)
-	{
-		global $langs,$conf,$user,$db;
-
-		$outkey='';
-		$outval='';
-		$outref='';
-		$outlabel='';
-		$outdesc='';
-		$outbarcode='';
-		$outtype='';
-		$outprice_ht='';
-		$outprice_ttc='';
-		$outpricebasetype='';
-		$outtva_tx='';
-		$outqty=1;
-		$outdiscount=0;
-
-		$maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO);
-
-		$label=$objp->label;
-		if (! empty($objp->label_translated)) $label=$objp->label_translated;
-		if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
-
-		$outkey=$objp->rowid;
-		$outref=$objp->ref;
-		$outlabel=$objp->label;
-		$outdesc=$objp->description;
-		$outbarcode=$objp->barcode;
-
-		$outtype=$objp->fk_product_type;
-		$outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
-		$outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
-
-		$opt = '<option value="'.$objp->rowid.'"';
-		$opt.= ($objp->rowid == $selected)?' selected':'';
-		if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0)
-		{
-			$opt.= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';
-		}
-		if (! empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock))
-		{
-			if ($objp->stock > 0) $opt.= ' class="product_line_stock_ok"';
-			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
-		}
-		$opt.= '>';
-		$opt.= $objp->ref;
-		if ($outbarcode) $opt.=' ('.$outbarcode.')';
-		$opt.=' - '.dol_trunc($label,$maxlengtharticle);
-
-		$objRef = $objp->ref;
-		if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-		$outval.=$objRef;
-		if ($outbarcode) $outval.=' ('.$outbarcode.')';
-		$outval.=' - '.dol_trunc($label,$maxlengtharticle);
-
-		$found=0;
-
-		// Multiprice
-		// If we need a particular price level (from 1 to 6)
-		if (empty($hidepriceinlabel) && $price_level >= 1 && (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
-		{
-			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-			$sql.= " WHERE fk_product='".$objp->rowid."'";
-			$sql.= " AND entity IN (".getEntity('productprice').")";
-			$sql.= " AND price_level=".$price_level;
-			$sql.= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
-			$sql.= " LIMIT 1";
-
-			dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);
-			$result2 = $this->db->query($sql);
-			if ($result2)
-			{
-				$objp2 = $this->db->fetch_object($result2);
-				if ($objp2)
-				{
-					$found=1;
-					if ($objp2->price_base_type == 'HT')
-					{
-						$opt.= ' - '.price($objp2->price,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
-						$outval.= ' - '.price($objp2->price,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
-					}
-					else
-					{
-						$opt.= ' - '.price($objp2->price_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
-						$outval.= ' - '.price($objp2->price_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
-					}
-					$outprice_ht=price($objp2->price);
-					$outprice_ttc=price($objp2->price_ttc);
-					$outpricebasetype=$objp2->price_base_type;
-					$outtva_tx=$objp2->tva_tx;
-				}
-			}
-			else
-			{
-				dol_print_error($this->db);
-			}
-		}
-
-		// Price by quantity
-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
-		{
-			$found = 1;
-			$outqty=$objp->quantity;
-			$outdiscount=$objp->remise_percent;
-			if ($objp->quantity == 1)
-			{
-				$opt.= ' - '.price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/";
-				$outval.= ' - '.price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/";
-				$opt.= $langs->trans("Unit");	// Do not use strtolower because it breaks utf8 encoding
-				$outval.=$langs->transnoentities("Unit");
-			}
-			else
-			{
-				$opt.= ' - '.price($objp->price,1,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
-				$outval.= ' - '.price($objp->price,0,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
-				$opt.= $langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
-				$outval.=$langs->transnoentities("Units");
-			}
-
-			$outprice_ht=price($objp->unitprice);
-			$outprice_ttc=price($objp->unitprice * (1 + ($objp->tva_tx / 100)));
-			$outpricebasetype=$objp->price_base_type;
-			$outtva_tx=$objp->tva_tx;
-		}
-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1)
-		{
-			$opt.=" (".price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
-			$outval.=" (".price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->transnoentities("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
-		}
-		if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1)
-		{
-			$opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
-			$outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
-		}
-
-		// Price by customer
-		if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
-			if (!empty($objp->idprodcustprice))
-			{
-				$found = 1;
-
-				if ($objp->custprice_base_type == 'HT')
-				{
-					$opt.= ' - '.price($objp->custprice,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
-					$outval.= ' - '.price($objp->custprice,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
-				}
-				else
-				{
-					$opt.= ' - '.price($objp->custprice_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
-					$outval.= ' - '.price($objp->custprice_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
-				}
-
-				$outprice_ht=price($objp->custprice);
-				$outprice_ttc=price($objp->custprice_ttc);
-				$outpricebasetype=$objp->custprice_base_type;
-				$outtva_tx=$objp->custtva_tx;
-			}
-		}
-
-		// If level no defined or multiprice not found, we used the default price
-		if (empty($hidepriceinlabel) && ! $found)
-		{
-			if ($objp->price_base_type == 'HT')
-			{
-				$opt.= ' - '.price($objp->price,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
-				$outval.= ' - '.price($objp->price,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
-			}
-			else
-			{
-				$opt.= ' - '.price($objp->price_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
-				$outval.= ' - '.price($objp->price_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
-			}
-			$outprice_ht=price($objp->price);
-			$outprice_ttc=price($objp->price_ttc);
-			$outpricebasetype=$objp->price_base_type;
-			$outtva_tx=$objp->tva_tx;
-		}
-
-		if (! empty($conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0)
-		{
-			$opt.= ' - '.$langs->trans("Stock").':'.$objp->stock;
-
-			if ($objp->stock > 0) {
-				$outval.= ' - <span class="product_line_stock_ok">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';
-			}elseif ($objp->stock <= 0) {
-				$outval.= ' - <span class="product_line_stock_too_low">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';
-			}
-		}
-
-		if ($outdurationvalue && $outdurationunit)
-		{
-			$da=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
-			if (isset($da[$outdurationunit]))
-			{
-				$key = $da[$outdurationunit].($outdurationvalue > 1?'s':'');
-				$opt.= ' - '.$outdurationvalue.' '.$langs->trans($key);
-				$outval.=' - '.$outdurationvalue.' '.$langs->transnoentities($key);
-			}
-		}
-
-		$opt.= "</option>\n";
-		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit);
-	}
+            }
+            if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
+            else if ($hidelabel > 1) {
+                $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
+                if ($hidelabel == 2) {
+                    print img_picto($langs->trans("Search"), 'search');
+                }
+            }
+            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+            if ($hidelabel == 3) {
+                print img_picto($langs->trans("Search"), 'search');
+            }
+        }
+        else
+        {
+            print $this->select_produits_list($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0,$socid,$showempty,$forcecombo,$morecss,$hidepriceinlabel, $warehouseStatus);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)
-	 *
-	 *	@param	int		$socid			Id third party
-	 *	@param  string	$selected       Preselected product
-	 *	@param  string	$htmlname       Name of HTML Select
-	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
-	 *	@param  string	$filtre			For a SQL filter
-	 *	@param	array	$ajaxoptions	Options for ajax_autocompleter
-	 *  @param	int		$hidelabel		Hide label (0=no, 1=yes)
-	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
-	 *	@return	void
-	 */
-	function select_produits_fournisseurs($socid, $selected='', $htmlname='productid', $filtertype='', $filtre='', $ajaxoptions=array(), $hidelabel=0, $alsoproductwithnosupplierprice=0)
-	{
+    /**
+     *	Return list of products for a customer
+     *
+     *	@param      int		$selected           Preselected product
+     *	@param      string	$htmlname           Name of select html
+     *  @param		string	$filtertype         Filter on product type (''=nofilter, 0=product, 1=service)
+     *	@param      int		$limit              Limit on number of returned lines
+     *	@param      int		$price_level        Level of price to show
+     * 	@param      string	$filterkey          Filter on product
+     *	@param		int		$status             -1=Return all products, 0=Products not on sell, 1=Products on sell
+     *  @param      int		$finished           Filter on finished field: 2=No filter
+     *  @param      int		$outputmode         0=HTML select string, 1=Array
+     *  @param      int		$socid     		    Thirdparty Id (to get also price dedicated to this customer)
+     *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+     * 	@param		int		$forcecombo		    Force to use combo box
+     *  @param      string  $morecss            Add more css on select
+     *  @param      int     $hidepriceinlabel   1=Hide prices in label
+     *  @param      string  $warehouseStatus    warehouse status filter, following comma separated filter options can be used
+     *										    'warehouseopen' = select products from open warehouses,
+     *										    'warehouseclosed' = select products from closed warehouses,
+     *										    'warehouseinternal' = select products from warehouses for internal correct/transfer only
+     *  @return     array    				    Array of keys for json
+     */
+    function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0,$showempty='1',$forcecombo=0,$morecss='',$hidepriceinlabel=0, $warehouseStatus='')
+    {
         // phpcs:enable
-		global $langs,$conf;
-		global $price_level, $status, $finished;
-
-		$selected_input_value='';
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
-		{
-			if ($selected > 0)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-				$producttmpselect = new Product($this->db);
-				$producttmpselect->fetch($selected);
-				$selected_input_value=$producttmpselect->ref;
-				unset($producttmpselect);
-			}
-
-			// mode=2 means suppliers products
-			$urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
-			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-			print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
-		}
-		else
-		{
-			print $this->select_produits_fournisseurs_list($socid,$selected,$htmlname,$filtertype,$filtre,'',-1,0,0,$alsoproductwithnosupplierprice);
-		}
-	}
+        global $langs,$conf,$user,$db;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of suppliers products
-	 *
-	 *	@param	int		$socid   		Id societe fournisseur (0 pour aucun filtre)
-	 *	@param  int		$selected       Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
-	 *	@param  string	$htmlname       Nom de la zone select
-	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
-	 *	@param  string	$filtre         Pour filtre sql
-	 *	@param  string	$filterkey      Filtre des produits
-	 *  @param  int		$statut         -1=Return all products, 0=Products not on sell, 1=Products on sell (not used here, a filter on tobuy is already hard coded in request)
-	 *  @param  int		$outputmode     0=HTML select string, 1=Array
-	 *  @param  int     $limit          Limit of line number
-	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
-	 *  @return array           		Array of keys for json
-	 */
-	function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0,$limit=100,$alsoproductwithnosupplierprice=0)
-	{
-        // phpcs:enable
-		global $langs,$conf,$db;
-
-		$out='';
-		$outarray=array();
-
-		$langs->load('stocks');
-
-		$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, p.fk_product_type,";
-		$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
-		$sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
-		$sql.= " pfp.supplier_reputation";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
-		if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-		$sql.= " WHERE p.entity IN (".getEntity('product').")";
-		$sql.= " AND p.tobuy = 1";
-		if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
-		if (! empty($filtre)) $sql.=" ".$filtre;
-		// Add criteria on ref/label
-		if ($filterkey != '')
-		{
-			$sql.=' AND (';
-			$prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
-			// For natural search
-			$scrit = explode(' ', $filterkey);
-			$i=0;
-			if (count($scrit) > 1) $sql.="(";
-			foreach ($scrit as $crit)
-			{
-				if ($i > 0) $sql.=" AND ";
-				$sql.="(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
-				$i++;
-			}
-			if (count($scrit) > 1) $sql.=")";
-			if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-			$sql.=')';
-		}
-		$sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
-		$sql.= $db->plimit($limit, 0);
-
-		// Build output string
-
-		dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-
-			$num = $this->db->num_rows($result);
-
-			//$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
-			$out.='<select class="flat maxwidthonsmartphone" id="'.$htmlname.'" name="'.$htmlname.'">';
-			if (! $selected) $out.='<option value="0" selected>&nbsp;</option>';
-			else $out.='<option value="0">&nbsp;</option>';
-
-			$i = 0;
-			while ($i < $num)
-			{
-				$objp = $this->db->fetch_object($result);
-
-				$outkey=$objp->idprodfournprice;                                                    // id in table of price
-				if (! $outkey && $alsoproductwithnosupplierprice) $outkey='idprod_'.$objp->rowid;   // id of product
-
-				$outref=$objp->ref;
-				$outval='';
-				$outqty=1;
-				$outdiscount=0;
-				$outtype=$objp->fk_product_type;
-				$outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
-				$outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
-
-				$opt = '<option value="'.$outkey.'"';
-				if ($selected && $selected == $objp->idprodfournprice) $opt.= ' selected';
-				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt.=' disabled';
-				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
-				{
-					$opt.= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqpercent="'.$objp->remise_percent.'"';
-				}
-				$opt.= '>';
-
-				$objRef = $objp->ref;
-				if ($filterkey && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-				$objRefFourn = $objp->ref_fourn;
-				if ($filterkey && $filterkey != '') $objRefFourn=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRefFourn,1);
-				$label = $objp->label;
-				if ($filterkey && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
-
-				$opt.=$objp->ref;
-				if (! empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
-					$opt.=' ('.$objp->ref_fourn.')';
-				$opt.=' - ';
-				$outval.=$objRef;
-				if (! empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
-					$outval.=' ('.$objRefFourn.')';
-				$outval.=' - ';
-				$opt.=dol_trunc($label, 72).' - ';
-				$outval.=dol_trunc($label, 72).' - ';
-
-				if (! empty($objp->idprodfournprice))
-				{
-					$outqty=$objp->quantity;
-					$outdiscount=$objp->remise_percent;
-					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
-						$prod_supplier = new ProductFournisseur($this->db);
-						$prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
-						$prod_supplier->id = $objp->fk_product;
-						$prod_supplier->fourn_qty = $objp->quantity;
-						$prod_supplier->fourn_tva_tx = $objp->tva_tx;
-						$prod_supplier->fk_supplier_price_expression = $objp->fk_supplier_price_expression;
-						$priceparser = new PriceParser($this->db);
-						$price_result = $priceparser->parseProductSupplier($prod_supplier);
-						if ($price_result >= 0) {
-							$objp->fprice = $price_result;
-							if ($objp->quantity >= 1)
-							{
-								$objp->unitprice = $objp->fprice / $objp->quantity;
-							}
-						}
-					}
-					if ($objp->quantity == 1)
-					{
-						$opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
-						$outval.= price($objp->fprice,0,$langs,0,0,-1,$conf->currency)."/";
-						$opt.= $langs->trans("Unit");	// Do not use strtolower because it breaks utf8 encoding
-						$outval.=$langs->transnoentities("Unit");
-					}
-					else
-					{
-						$opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
-						$outval.= price($objp->fprice,0,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
-						$opt.= ' '.$langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
-						$outval.= ' '.$langs->transnoentities("Units");
-					}
+        $out='';
+        $outarray=array();
 
-					if ($objp->quantity >= 1)
-					{
-						$opt.=" (".price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
-						$outval.=" (".price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->transnoentities("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
-					}
-					if ($objp->remise_percent >= 1)
-					{
-						$opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
-						$outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
-					}
-					if ($objp->duration)
-					{
-						$opt .= " - ".$objp->duration;
-						$outval.=" - ".$objp->duration;
-					}
-					if (! $socid)
-					{
-						$opt .= " - ".dol_trunc($objp->name,8);
-						$outval.=" - ".dol_trunc($objp->name,8);
-					}
-					if ($objp->supplier_reputation)
-					{
-						//TODO dictionary
-						$reputations=array(''=>$langs->trans('Standard'),'FAVORITE'=>$langs->trans('Favorite'),'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
+        $warehouseStatusArray = array();
+        if (! empty($warehouseStatus))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+            if (preg_match('/warehouseclosed/', $warehouseStatus))
+            {
+                $warehouseStatusArray[] = Entrepot::STATUS_CLOSED;
+            }
+            if (preg_match('/warehouseopen/', $warehouseStatus))
+            {
+                $warehouseStatusArray[] = Entrepot::STATUS_OPEN_ALL;
+            }
+            if (preg_match('/warehouseinternal/', $warehouseStatus))
+            {
+                $warehouseStatusArray[] = Entrepot::STATUS_OPEN_INTERNAL;
+            }
+        }
 
-						$opt .= " - ".$reputations[$objp->supplier_reputation];
-						$outval.=" - ".$reputations[$objp->supplier_reputation];
-					}
-				}
-				else
-				{
-					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
-					{
-						$opt.= $langs->trans("NoPriceDefinedForThisSupplier");
-						$outval.=$langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
-					else                                            // No supplier price defined for product, even on other suppliers
-					{
-						$opt.= $langs->trans("NoPriceDefinedForThisSupplier");
-						$outval.=$langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
-				}
-				$opt .= "</option>\n";
-
-
-				// Add new entry
-				// "key" value of json key array is used by jQuery automatically as selected value
-				// "label" value of json key array is used by jQuery automatically as text for combo box
-				$out.=$opt;
-				array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
-				// Exemple of var_dump $outarray
-				// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
-				//           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
-				//      	 ["qty"]=>string(1) "1" ["discount"]=>string(1) "0" ["disabled"]=>bool(false)
-				//}
-				//var_dump($outval); var_dump(utf8_check($outval)); var_dump(json_encode($outval));
-				//$outval=array('label'=>'ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/ Unité (20,00 Euros/unité)');
-				//var_dump($outval); var_dump(utf8_check($outval)); var_dump(json_encode($outval));
-
-				$i++;
-			}
-			$out.='</select>';
-
-			$this->db->free($result);
-
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			$out.=ajax_combobox($htmlname);
-
-			if (empty($outputmode)) return $out;
-			return $outarray;
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+        $selectFields = " p.rowid, p.label, p.ref, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
+        (count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of suppliers prices for a product
-	 *
-	 *  @param	    int		$productid       	Id of product
-	 *  @param      string	$htmlname        	Name of HTML field
-	 *  @param      int		$selected_supplier  Pre-selected supplier if more than 1 result
-	 *  @return	    void
-	 */
-	function select_product_fourn_price($productid, $htmlname='productfournpriceid', $selected_supplier='')
-	{
-        // phpcs:enable
-		global $langs,$conf;
-
-		$langs->load('stocks');
-
-		$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, pfp.fk_soc,";
-		$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";
-		$sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-		$sql.= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
-		$sql.= " AND p.tobuy = 1";
-		$sql.= " AND s.fournisseur = 1";
-		$sql.= " AND p.rowid = ".$productid;
-		$sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
-
-		dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
-		$result=$this->db->query($sql);
-
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-
-			$form = '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-
-			if (! $num)
-			{
-				$form.= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
-			}
-			else
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-				$form.= '<option value="0">&nbsp;</option>';
-
-				$i = 0;
-				while ($i < $num)
-				{
-					$objp = $this->db->fetch_object($result);
-
-					$opt = '<option value="'.$objp->idprodfournprice.'"';
-					//if there is only one supplier, preselect it
-					if($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {
-						$opt .= ' selected';
-					}
-					$opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
-
-					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
-						$prod_supplier = new ProductFournisseur($this->db);
-						$prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
-						$prod_supplier->id = $productid;
-						$prod_supplier->fourn_qty = $objp->quantity;
-						$prod_supplier->fourn_tva_tx = $objp->tva_tx;
-						$prod_supplier->fk_supplier_price_expression = $objp->fk_supplier_price_expression;
-						$priceparser = new PriceParser($this->db);
-						$price_result = $priceparser->parseProductSupplier($prod_supplier);
-						if ($price_result >= 0) {
-							$objp->fprice = $price_result;
-							if ($objp->quantity >= 1)
-							{
-								$objp->unitprice = $objp->fprice / $objp->quantity;
-							}
-						}
-					}
-					if ($objp->quantity == 1)
-					{
-						$opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
-					}
+        $sql = "SELECT ";
+        $sql.= $selectFields . $selectFieldsGrouped;
 
-					$opt.= $objp->quantity.' ';
+        if (! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
+        {
+            //Product category
+            $sql.= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
+						FROM ".MAIN_DB_PREFIX."categorie_product
+						WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid
+						LIMIT 1
+				) AS categorie_product_id ";
+        }
 
-					if ($objp->quantity == 1)
-					{
-						$opt.= $langs->trans("Unit");
-					}
-					else
-					{
-						$opt.= $langs->trans("Units");
-					}
-					if ($objp->quantity > 1)
-					{
-						$opt.=" - ";
-						$opt.= price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
-					}
-					if ($objp->duration) $opt .= " - ".$objp->duration;
-					$opt .= "</option>\n";
-
-					$form.= $opt;
-					$i++;
-				}
-			}
-
-			$form.= '</select>';
-			$this->db->free($result);
-			return $form;
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+        //Price by customer
+        if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))
+        {
+            $sql.=', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
+            $sql.=' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
+            $selectFields.= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return list of delivery address
-	 *
-	 *    @param    string	$selected          	Id contact pre-selectionn
-	 *    @param    int		$socid				Id of company
-	 *    @param    string	$htmlname          	Name of HTML field
-	 *    @param    int		$showempty         	Add an empty field
-	 *    @return	integer|null
-	 */
-	function select_address($selected, $socid, $htmlname='address_id',$showempty=0)
-	{
-        // phpcs:enable
-		// looking for users
-		$sql = "SELECT a.rowid, a.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX ."societe_address as a";
-		$sql .= " WHERE a.fk_soc = ".$socid;
-		$sql .= " ORDER BY a.label ASC";
-
-		dol_syslog(get_class($this)."::select_address", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					if ($selected && $selected == $obj->rowid)
-					{
-						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
-					}
-					else
-					{
-						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
-					}
-					$i++;
-				}
-			}
-			print '</select>';
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+        // Multilang : we add translation
+        if (! empty($conf->global->MAIN_MULTILANGS))
+        {
+            $sql.= ", pl.label as label_translated";
+            $selectFields.= ", label_translated";
+        }
+        // Price by quantity
+        if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+        {
+            $sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
+            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level;
+            $sql.= " ORDER BY date_price";
+            $sql.= " DESC LIMIT 1) as price_rowid";
+            $sql.= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";	// price_by_qty is 1 if some prices by qty exists in subtable
+            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level;
+            $sql.= " ORDER BY date_price";
+            $sql.= " DESC LIMIT 1) as price_by_qty";
+            $selectFields.= ", price_rowid, price_by_qty";
+        }
+        $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+        if (count($warehouseStatusArray))
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid";
+        }
 
+        // include search in supplier ref
+        if(!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Load into cache list of payment terms
-	 *
-	 *      @return     int             Nb of lines loaded, <0 if KO
-	 */
-	function load_cache_conditions_paiements()
-	{
-        // phpcs:enable
-		global $langs;
-
-		$num = count($this->cache_conditions_paiements);
-		if ($num > 0) return 0;    // Cache already loaded
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = "SELECT rowid, code, libelle as label";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
-		$sql.= " WHERE entity IN (".getEntity('c_payment_term').")";
-		$sql.= " AND active > 0";
-		$sql.= " ORDER BY sortorder";
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label=($langs->trans("PaymentConditionShort".$obj->code)!=("PaymentConditionShort".$obj->code)?$langs->trans("PaymentConditionShort".$obj->code):($obj->label!='-'?$obj->label:''));
-				$this->cache_conditions_paiements[$obj->rowid]['code'] =$obj->code;
-				$this->cache_conditions_paiements[$obj->rowid]['label']=$label;
-				$i++;
-			}
-
-			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
-
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+        //Price by customer
+        if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+            $sql.=" LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
+        }
+        // Multilang : we add translation
+        if (! empty($conf->global->MAIN_MULTILANGS))
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='". $langs->getDefaultLang() ."'";
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Charge dans cache la liste des délais de livraison possibles
-	 *
-	 *      @return     int             Nb of lines loaded, <0 if KO
-	 */
-	function load_cache_availability()
-	{
-        // phpcs:enable
-		global $langs;
-
-		$num = count($this->cache_availability);
-		if ($num > 0) return 0;    // Cache already loaded
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$langs->load('propal');
-
-		$sql = "SELECT rowid, code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_availability';
-		$sql.= " WHERE active > 0";
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label=($langs->trans("AvailabilityType".$obj->code)!=("AvailabilityType".$obj->code)?$langs->trans("AvailabilityType".$obj->code):($obj->label!='-'?$obj->label:''));
-				$this->cache_availability[$obj->rowid]['code'] =$obj->code;
-				$this->cache_availability[$obj->rowid]['label']=$label;
-				$i++;
-			}
-
-			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
-
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *      Retourne la liste des types de delais de livraison possibles
-	 *
-	 *      @param	int		$selected        Id du type de delais pre-selectionne
-	 *      @param  string	$htmlname        Nom de la zone select
-	 *      @param  string	$filtertype      To add a filter
-	 *		@param	int		$addempty		Add empty entry
-	 *		@return	void
-	 */
-	function selectAvailabilityDelay($selected='',$htmlname='availid',$filtertype='',$addempty=0)
-	{
-		global $langs,$user;
-
-		$this->load_cache_availability();
-
-		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
-
-		print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0">&nbsp;</option>';
-		foreach($this->cache_availability as $id => $arrayavailability)
-		{
-			if ($selected == $id)
-			{
-				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
-				print '<option value="'.$id.'">';
-			}
-			print $arrayavailability['label'];
-			print '</option>';
-		}
-		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	}
-
-	/**
-	 *      Load into cache cache_demand_reason, array of input reasons
-	 *
-	 *      @return     int             Nb of lines loaded, <0 if KO
-	 */
-	function loadCacheInputReason()
-	{
-		global $langs;
-
-		$num = count($this->cache_demand_reason);
-		if ($num > 0) return 0;    // Cache already loaded
-
-		$sql = "SELECT rowid, code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
-		$sql.= " WHERE active > 0";
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			$tmparray=array();
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label=($obj->label!='-'?$obj->label:'');
-				if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work
-				if ($langs->trans($obj->code) != $obj->code) $label=$langs->trans($obj->code);																// So translation key SRC_XXX will work
-
-				$tmparray[$obj->rowid]['id']   =$obj->rowid;
-				$tmparray[$obj->rowid]['code'] =$obj->code;
-				$tmparray[$obj->rowid]['label']=$label;
-				$i++;
-			}
-
-			$this->cache_demand_reason=dol_sort_array($tmparray, 'label', 'asc', 0, 0, 1);
-
-			unset($tmparray);
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *	Return list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
-	 *  List found into table c_input_reason loaded by loadCacheInputReason
-	 *
-	 *  @param	int		$selected        Id or code of type origin to select by default
-	 *  @param  string	$htmlname        Nom de la zone select
-	 *  @param  string	$exclude         To exclude a code value (Example: SRC_PROP)
-	 *	@param	int		$addempty		 Add an empty entry
-	 *	@return	void
-	 */
-	function selectInputReason($selected='',$htmlname='demandreasonid',$exclude='',$addempty=0)
-	{
-		global $langs,$user;
-
-		$this->loadCacheInputReason();
-
-		print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0"'.(empty($selected)?' selected':'').'>&nbsp;</option>';
-		foreach($this->cache_demand_reason as $id => $arraydemandreason)
-		{
-			if ($arraydemandreason['code']==$exclude) continue;
-
-			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
-			{
-				print '<option value="'.$arraydemandreason['id'].'" selected>';
-			}
-			else
-			{
-				print '<option value="'.$arraydemandreason['id'].'">';
-			}
-			$label=$arraydemandreason['label'];	// Translation of label was already done into the ->loadCacheInputReason
-			print $langs->trans($label);
-			print '</option>';
-		}
-		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	}
+        if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Charge dans cache la liste des types de paiements possibles
-	 *
-	 *      @return     int                 Nb of lines loaded, <0 if KO
-	 */
-	function load_cache_types_paiements()
-	{
-        // phpcs:enable
-		global $langs;
-
-		$num=count($this->cache_types_paiements);
-		if ($num > 0) return $num;    // Cache already loaded
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$this->cache_types_paiements = array();
-
-		$sql = "SELECT id, code, libelle as label, type, active";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
-		$sql.= " WHERE entity IN (".getEntity('c_paiement').")";
-		//if ($active >= 0) $sql.= " AND active = ".$active;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
-				$this->cache_types_paiements[$obj->id]['id'] =$obj->id;
-				$this->cache_types_paiements[$obj->id]['code'] =$obj->code;
-				$this->cache_types_paiements[$obj->id]['label']=$label;
-				$this->cache_types_paiements[$obj->id]['type'] =$obj->type;
-				$this->cache_types_paiements[$obj->id]['active'] =$obj->active;
-				$i++;
-			}
-
-			$this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
-
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
+        if (count($warehouseStatusArray))
+        {
+            $sql.= ' AND (p.fk_product_type = 1 OR e.statut IN ('.$this->db->escape(implode(',',$warehouseStatusArray)).'))';
+        }
 
+        if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+            $sql .= " AND pac.rowid IS NULL";
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Return list of payment modes.
-	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
-	 *      See instead to force the default value by the caller.
-	 *
-	 *      @param	int		$selected		Id of payment term to preselect by default
-	 *      @param	string	$htmlname		Nom de la zone select
-	 *      @param	int		$filtertype		Not used
-	 *		@param	int		$addempty		Add an empty entry
-	 * 		@param	int		$noinfoadmin		0=Add admin info, 1=Disable admin info
-	 * 		@param	string	$morecss			Add more CSS on select tag
-	 *		@return	void
-	 */
-	function select_conditions_paiements($selected=0, $htmlname='condid', $filtertype=-1, $addempty=0, $noinfoadmin=0, $morecss='')
-	{
-        // phpcs:enable
-		global $langs, $user, $conf;
-
-		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
-
-		$this->load_cache_conditions_paiements();
-
-		// Set default value if not already set by caller
-		if (empty($selected) && ! empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
-
-		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0">&nbsp;</option>';
-		foreach($this->cache_conditions_paiements as $id => $arrayconditions)
-		{
-			if ($selected == $id)
-			{
-				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
-				print '<option value="'.$id.'">';
-			}
-			print $arrayconditions['label'];
-			print '</option>';
-		}
-		print '</select>';
-		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	}
+        if ($finished == 0)
+        {
+            $sql.= " AND p.finished = ".$finished;
+        }
+        elseif ($finished == 1)
+        {
+            $sql.= " AND p.finished = ".$finished;
+            if ($status >= 0)  $sql.= " AND p.tosell = ".$status;
+        }
+        elseif ($status >= 0)
+        {
+            $sql.= " AND p.tosell = ".$status;
+        }
+        if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
+        // Add criteria on ref/label
+        if ($filterkey != '')
+        {
+            $sql.=' AND (';
+            $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+            // For natural search
+            $scrit = explode(' ', $filterkey);
+            $i=0;
+            if (count($scrit) > 1) $sql.="(";
+            foreach ($scrit as $crit)
+            {
+                if ($i > 0) $sql.=" AND ";
+                $sql.="(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
+                if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
+                if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
+                {
+                    $sql.=" OR p.description LIKE '".$db->escape($prefix.$crit)."%'";
+                    if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
+                }
+                if (! empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql.=" OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
+                $sql.=")";
+                $i++;
+            }
+            if (count($scrit) > 1) $sql.=")";
+                if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
+            $sql.=')';
+        }
+        if (count($warehouseStatusArray))
+        {
+            $sql.= ' GROUP BY'.$selectFields;
+        }
 
+        //Sort by category
+        if(! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
+        {
+            $sql .= " ORDER BY categorie_product_id ";
+            //ASC OR DESC order
+            ($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .="ASC" : $sql .="DESC";
+        }
+        else
+        {
+            $sql.= $db->order("p.ref");
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Return list of payment methods
-	 *
-	 *      @param	string	$selected       Id du mode de paiement pre-selectionne
-	 *      @param  string	$htmlname       Nom de la zone select
-	 *      @param  string	$filtertype     To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
-	 *      @param  int		$format         0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
-	 *      @param  int		$empty			1=peut etre vide, 0 sinon
-	 * 		@param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
-	 *      @param  int		$maxlength      Max length of label
-	 *      @param  int     $active         Active or not, -1 = all
-	 *      @param  string  $morecss        Add more CSS on select tag
-	 * 		@return	void
-	 */
-	function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=1, $noadmininfo=0, $maxlength=0, $active=1, $morecss='')
-	{
-        // phpcs:enable
-		global $langs,$user;
-
-		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
-
-		$filterarray=array();
-		if ($filtertype == 'CRDT')  	$filterarray=array(0,2,3);
-		elseif ($filtertype == 'DBIT') 	$filterarray=array(1,2,3);
-		elseif ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype);
-
-		$this->load_cache_types_paiements();
-
-		print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
-		if ($empty) print '<option value="">&nbsp;</option>';
-		foreach($this->cache_types_paiements as $id => $arraytypes)
-		{
-			// If not good status
-			if ($active >= 0 && $arraytypes['active'] != $active) continue;
-
-			// On passe si on a demande de filtrer sur des modes de paiments particuliers
-			if (count($filterarray) && ! in_array($arraytypes['type'],$filterarray)) continue;
-
-			// We discard empty line if showempty is on because an empty line has already been output.
-			if ($empty && empty($arraytypes['code'])) continue;
-
-			if ($format == 0) print '<option value="'.$id.'"';
-			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-			elseif ($format == 3) print '<option value="'.$id.'"';
-			// Si selected est text, on compare avec code, sinon avec id
-			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-			elseif ($selected == $id) print ' selected';
-			print '>';
-			if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'],$maxlength):$arraytypes['label']);
-			elseif ($format == 1) $value=$arraytypes['code'];
-			elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'],$maxlength):$arraytypes['label']);
-			elseif ($format == 3) $value=$arraytypes['code'];
-			print $value?$value:'&nbsp;';
-			print '</option>';
-		}
-		print '</select>';
-		if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	}
-
-
-	/**
-	 *  Selection HT or TTC
-	 *
-	 *  @param	string	$selected       Id pre-selectionne
-	 *  @param  string	$htmlname       Nom de la zone select
-	 * 	@return	string					Code of HTML select to chose tax or not
-	 */
-	function selectPriceBaseType($selected='',$htmlname='price_base_type')
-	{
-		global $langs;
-
-		$return='';
-
-		$return.= '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-		$options = array(
-			'HT'=>$langs->trans("HT"),
-			'TTC'=>$langs->trans("TTC")
-		);
-		foreach($options as $id => $value)
-		{
-			if ($selected == $id)
-			{
-				$return.= '<option value="'.$id.'" selected>'.$value;
-			}
-			else
-			{
-				$return.= '<option value="'.$id.'">'.$value;
-			}
-			$return.= '</option>';
-		}
-		$return.= '</select>';
-
-		return $return;
-	}
-
-	/**
-	 *  Return a HTML select list of shipping mode
-	 *
-	 *  @param	string	$selected          Id shipping mode pre-selected
-	 *  @param  string	$htmlname          Name of select zone
-	 *  @param  string	$filtre            To filter list
-	 *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-	 *  @param  string	$moreattrib        To add more attribute on select
-	 * 	@return	void
-	 */
-	function selectShippingMethod($selected='',$htmlname='shipping_method_id',$filtre='',$useempty=0,$moreattrib='')
-	{
-		global $langs, $conf, $user;
-
-		$langs->load("admin");
-		$langs->load("deliveries");
-
-		$sql = "SELECT rowid, code, libelle as label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
-		$sql.= " WHERE active > 0";
-		if ($filtre) $sql.=" AND ".$filtre;
-		$sql.= " ORDER BY libelle ASC";
-
-		dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			if ($num) {
-				print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
-					print '<option value="-1">&nbsp;</option>';
-				}
-				while ($i < $num) {
-					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid) {
-						print '<option value="'.$obj->rowid.'" selected>';
-					} else {
-						print '<option value="'.$obj->rowid.'">';
-					}
-					print ($langs->trans("SendingMethod".strtoupper($obj->code)) != "SendingMethod".strtoupper($obj->code)) ? $langs->trans("SendingMethod".strtoupper($obj->code)) : $obj->label;
-					print '</option>';
-					$i++;
-				}
-				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			} else {
-				print $langs->trans("NoShippingMethodDefined");
-			}
-		} else {
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 *    Display form to select shipping mode
-	 *
-	 *    @param	string	$page        Page
-	 *    @param    int		$selected    Id of shipping mode
-	 *    @param    string	$htmlname    Name of select html field
-	 *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-	 *    @return	void
-	 */
-	function formSelectShippingMethod($page, $selected='', $htmlname='shipping_method_id', $addempty=0)
-	{
-		global $langs, $db;
-
-		$langs->load("deliveries");
-
-		if ($htmlname != "none") {
-			print '<form method="POST" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setshippingmethod">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$this->selectShippingMethod($selected, $htmlname, '', $addempty);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		} else {
-			if ($selected) {
-				$code=$langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');
-				print $langs->trans("SendingMethod".strtoupper($code));
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
-
-	/**
-	 * Creates HTML last in cycle situation invoices selector
-	 *
-	 * @param     string  $selected   		Preselected ID
-	 * @param     int     $socid      		Company ID
-	 *
-	 * @return    string                     HTML select
-	 */
-	function selectSituationInvoices($selected = '', $socid = 0)
-	{
-		global $langs;
-
-		$langs->load('bills');
-
-		$opt = '<option value ="" selected></option>';
-		$sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_counter>=1';
-		$sql.= ' ORDER by situation_cycle_ref, situation_counter desc';
-		$resql = $this->db->query($sql);
-		if ($resql && $this->db->num_rows($resql) > 0) {
-			// Last seen cycle
-			$ref = 0;
-			while ($obj = $this->db->fetch_object($resql)){
-				//Same company ?
-			    if ($socid == $obj->fk_soc) {
-					//Same cycle ?
-			        if ($obj->situation_cycle_ref != $ref) {
-						// Just seen this cycle
-			            $ref = $obj->situation_cycle_ref;
-						//not final ?
-			            if ($obj->situation_final != 1) {
-							//Not prov?
-			                if (substr($obj->ref, 1, 4) != 'PROV') {
-			                    if ($selected == $obj->rowid) {
-			                        $opt .= '<option value="' . $obj->rowid . '" selected>' . $obj->ref . '</option>';
-								} else {
-								    $opt .= '<option value="' . $obj->rowid . '">' . $obj->ref . '</option>';
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-				dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
-		}
-		if ($opt == '<option value ="" selected></option>')
-		{
-			$opt = '<option value ="0" selected>' . $langs->trans('NoSituations') . '</option>';
-		}
-		return $opt;
-	}
-
-	/**
-	 *      Creates HTML units selector (code => label)
-	 *
-	 *      @param	string	$selected       Preselected Unit ID
-	 *      @param  string	$htmlname       Select name
-	 *      @param	int		$showempty		Add a nempty line
-	 * 		@return	string                  HTML select
-	 */
-	function selectUnits($selected = '', $htmlname = 'units', $showempty=0)
-	{
-		global $langs;
-
-		$langs->load('products');
-
-		$return= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-
-		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
-		$sql.= ' WHERE active > 0';
-
-		$resql = $this->db->query($sql);
-		if($resql && $this->db->num_rows($resql) > 0)
-		{
-			if ($showempty) $return .= '<option value="none"></option>';
-
-			while($res = $this->db->fetch_object($resql))
-			{
-			    $unitLabel = $res->label;
-			    if (! empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
-			    {
-			        $unitLabel = $langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label;
-			    }
-
-				if ($selected == $res->rowid)
-				{
-				    $return.='<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
-				}
-				else
-				{
-				    $return.='<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
-				}
-			}
-			$return.='</select>';
-		}
-		return $return;
-	}
+        $sql.= $db->plimit($limit, 0);
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return a HTML select list of bank accounts
-	 *
-	 *  @param	string	$selected           Id account pre-selected
-	 *  @param  string	$htmlname           Name of select zone
-	 *  @param  int		$statut             Status of searched accounts (0=open, 1=closed, 2=both)
-	 *  @param  string	$filtre             To filter list
-	 *  @param  int		$useempty           1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-	 *  @param  string	$moreattrib         To add more attribute on select
-	 *  @param	int		$showcurrency		Show currency in label
-	 * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)
-	 */
-	function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0,$moreattrib='',$showcurrency=0)
-	{
-        // phpcs:enable
-		global $langs, $conf;
-
-		$langs->load("admin");
-		$num = 0;
-
-		$sql = "SELECT rowid, label, bank, clos as status, currency_code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-		$sql.= " WHERE entity IN (".getEntity('bank_account').")";
-		if ($statut != 2) $sql.= " AND clos = '".$statut."'";
-		if ($filtre) $sql.=" AND ".$filtre;
-		$sql.= " ORDER BY label";
-
-		dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			if ($num)
-			{
-				print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-				if ($useempty == 1 || ($useempty == 2 && $num > 1))
-				{
-					print '<option value="-1">&nbsp;</option>';
-				}
-
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid)
-					{
-						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
-						print '<option value="'.$obj->rowid.'">';
-					}
-					print trim($obj->label);
-					if ($showcurrency) print ' ('.$obj->currency_code.')';
-					if ($statut == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
-					print '</option>';
-					$i++;
-				}
-				print "</select>";
-			}
-			else
-			{
-				if ($statut == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
-			}
-		}
-		else {
-			dol_print_error($this->db);
-		}
-
-		return $num;
-	}
-
-	/**
-	 *    Display form to select bank account
-	 *
-	 *    @param	string	$page        Page
-	 *    @param    int		$selected    Id of bank account
-	 *    @param    string	$htmlname    Name of select html field
-	 *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-	 *    @return	void
-	 */
-	function formSelectAccount($page, $selected='', $htmlname='fk_account', $addempty=0)
-	{
-		global $langs;
-		if ($htmlname != "none") {
-			print '<form method="POST" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setbankaccount">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);
-			if ($nbaccountfound > 0) print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		} else {
-
-			$langs->load('banks');
-
-			if ($selected) {
-				require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
-				$bankstatic=new Account($this->db);
-				$result = $bankstatic->fetch($selected);
-				if ($result) print $bankstatic->getNomUrl(1);
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
+        // Build output string
+        dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+            $num = $this->db->num_rows($result);
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return list of categories having choosed type
-	 *
-	 *    @param	string|int	$type				Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-	 *    @param    string		$selected    		Id of category preselected or 'auto' (autoselect category if there is only one element)
-	 *    @param    string		$htmlname			HTML field name
-	 *    @param    int			$maxlength      	Maximum length for labels
-	 *    @param    int			$excludeafterid 	Exclude all categories after this leaf in category tree.
-	 *    @param	int			$outputmode			0=HTML select string, 1=Array
-	 *    @return	string
-	 *    @see select_categories
-	 */
-	function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0, $outputmode=0)
-	{
-        // phpcs:enable
-		global $conf, $langs;
-		$langs->load("categories");
-
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-		// For backward compatibility
-		if (is_numeric($type))
-		{
-			dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
-		}
-
-		if ($type === Categorie::TYPE_BANK_LINE)
-		{
-			// TODO Move this into common category feature
-			$categids=array();
-			$sql = "SELECT c.label, c.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
-			$sql.= " WHERE entity = ".$conf->entity;
-			$sql.= " ORDER BY c.label";
-			$result = $this->db->query($sql);
-			if ($result)
-			{
-				$num = $this->db->num_rows($result);
-				$i = 0;
-				while ($i < $num)
-				{
-					$objp = $this->db->fetch_object($result);
-					if ($objp) $cate_arbo[$objp->rowid]=array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
-					$i++;
-				}
-				$this->db->free($result);
-			}
-			else dol_print_error($this->db);
-		}
-		else
-		{
-			$cat = new Categorie($this->db);
-			$cate_arbo = $cat->get_full_arbo($type, $excludeafterid);
-		}
-
-		$output = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-		$outarray=array();
-		if (is_array($cate_arbo))
-		{
-			if (! count($cate_arbo)) $output.= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else
-			{
-				$output.= '<option value="-1">&nbsp;</option>';
-				foreach($cate_arbo as $key => $value)
-				{
-					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
-					{
-						$add = 'selected ';
-					}
-					else
-					{
-						$add = '';
-					}
-					$output.= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'],$maxlength,'middle').'</option>';
+            $events=null;
 
-					$outarray[$cate_arbo[$key]['id']] = $cate_arbo[$key]['fulllabel'];
-				}
-			}
-		}
-		$output.= '</select>';
-		$output.= "\n";
+            if (! $forcecombo)
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+            }
 
-		if ($outputmode) return $outarray;
-		return $output;
-	}
+            $out.='<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *     Show a confirmation HTML form or AJAX popup
-	 *
-	 *     @param	string		$page        	   	Url of page to call if confirmation is OK
-	 *     @param	string		$title       	   	Title
-	 *     @param	string		$question    	   	Question
-	 *     @param 	string		$action      	   	Action
-	 *	   @param	array		$formquestion	   	An array with forms complementary inputs
-	 * 	   @param	string		$selectedchoice		"" or "no" or "yes"
-	 * 	   @param	int			$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=preoutput confirm box with div id=dialog-confirm-xxx
-	 *     @param	int			$height          	Force height of box
-	 *     @param	int			$width				Force width of box
-	 *     @return 	void
-	 *     @deprecated
-	 *     @see formconfirm()
-	 */
-	function form_confirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=170, $width=500)
-	{
-        // phpcs:enable
-        dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
-		print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);
-	}
-
-	/**
-	 *     Show a confirmation HTML form or AJAX popup.
-	 *     Easiest way to use this is with useajax=1.
-	 *     If you use useajax='xxx', you must also add jquery code to trigger opening of box (with correct parameters)
-	 *     just after calling this method. For example:
-	 *       print '<script type="text/javascript">'."\n";
-	 *       print 'jQuery(document).ready(function() {'."\n";
-	 *       print 'jQuery(".xxxlink").click(function(e) { jQuery("#aparamid").val(jQuery(this).attr("rel")); jQuery("#dialog-confirm-xxx").dialog("open"); return false; });'."\n";
-	 *       print '});'."\n";
-	 *       print '</script>'."\n";
-	 *
-	 *     @param  	string		$page        	   	Url of page to call if confirmation is OK. Can contains paramaters (param 'action' and 'confirm' will be reformated)
-	 *     @param	string		$title       	   	Title
-	 *     @param	string		$question    	   	Question
-	 *     @param 	string		$action      	   	Action
-	 *	   @param  	array		$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
-	 *												type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
-	 * 	   @param  	string		$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
-	 * 	   @param  	int			$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
-	 *     @param  	int			$height          	Force height of box
-	 *     @param	int			$width				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
-	 *     @param	int			$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.
-	 *     @return 	string      	    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
-	 */
-	function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice='', $useajax=0, $height=210, $width=500, $disableformtag=0)
-	{
-		global $langs,$conf;
-		global $useglobalvars;
-
-		$more='';
-		$formconfirm='';
-		$inputok=array();
-		$inputko=array();
-
-		// Clean parameters
-		$newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
-		if ($conf->browser->layout == 'phone') $width='95%';
-
-		if (is_array($formquestion) && ! empty($formquestion))
-		{
-			// First add hidden fields and value
-			foreach ($formquestion as $key => $input)
-			{
-				if (is_array($input) && ! empty($input))
-				{
-					if ($input['type'] == 'hidden')
-					{
-						$more.='<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.dol_escape_htmltag($input['value']).'">'."\n";
-					}
-				}
-			}
-
-			// Now add questions
-			$more.='<table class="paddingtopbottomonly" width="100%">'."\n";
-			if (! empty($formquestion['text'])) $more.='<tr><td colspan="2">'.$formquestion['text'].'</td></tr>'."\n";
-			foreach ($formquestion as $key => $input)
-			{
-				if (is_array($input) && ! empty($input))
-				{
-					$size=(! empty($input['size'])?' size="'.$input['size'].'"':'');
-					$moreattr=(! empty($input['moreattr'])?' '.$input['moreattr']:'');
-					$morecss=(! empty($input['morecss'])?' '.$input['morecss']:'');
-
-					if ($input['type'] == 'text')
-					{
-						$more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";
-					}
-					elseif ($input['type'] == 'password')
-					{
-						$more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";
-					}
-					elseif ($input['type'] == 'select')
-					{
-						$more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>';
-						if (! empty($input['label'])) $more.=$input['label'].'</td><td class="tdtop" align="left">';
-						$more.=$this->selectarray($input['name'],$input['values'],$input['default'],1,0,0,$moreattr,0,0,0,'',$morecss);
-						$more.='</td></tr>'."\n";
-					}
-					elseif ($input['type'] == 'checkbox')
-					{
-						$more.='<tr>';
-						$more.='<td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].' </td><td align="left">';
-						$more.='<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;
-						if (! is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') $more.=' checked';
-						if (is_bool($input['value']) && $input['value']) $more.=' checked';
-						if (isset($input['disabled'])) $more.=' disabled';
-						$more.=' /></td>';
-						$more.='</tr>'."\n";
-					}
-					elseif ($input['type'] == 'radio')
-					{
-						$i=0;
-						foreach($input['values'] as $selkey => $selval)
-						{
-							$more.='<tr>';
-							if ($i==0) $more.='<td'.(empty($input['tdclass'])?' class="tdtop"':(' class="tdtop '.$input['tdclass'].'"')).'>'.$input['label'].'</td>';
-							else $more.='<td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>&nbsp;</td>';
-							$more.='<td><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
-							if ($input['disabled']) $more.=' disabled';
-							$more.=' /> ';
-							$more.=$selval;
-							$more.='</td></tr>'."\n";
-							$i++;
-						}
-					}
-					elseif ($input['type'] == 'date')
-					{
-						$more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td>';
-						$more.='<td align="left">';
-						$more.=$this->selectDate($input['value'],$input['name'],0,0,0,'',1,0);
-						$more.='</td></tr>'."\n";
-						$formquestion[] = array('name'=>$input['name'].'day');
-						$formquestion[] = array('name'=>$input['name'].'month');
-						$formquestion[] = array('name'=>$input['name'].'year');
-						$formquestion[] = array('name'=>$input['name'].'hour');
-						$formquestion[] = array('name'=>$input['name'].'min');
-					}
-					elseif ($input['type'] == 'other')
-					{
-						$more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>';
-						if (! empty($input['label'])) $more.=$input['label'].'</td><td align="left">';
-						$more.=$input['value'];
-						$more.='</td></tr>'."\n";
-					}
+            $textifempty='';
+            // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+            //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+            if (! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+            {
+                if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
+                else $textifempty.=$langs->trans("All");
+            }
+            if ($showempty) $out.='<option value="0" selected>'.$textifempty.'</option>';
 
-					elseif ($input['type'] == 'onecolumn')
-					{
-						$more.='<tr><td colspan="2" align="left">';
-						$more.=$input['value'];
-						$more.='</td></tr>'."\n";
-					}
-				}
-			}
-			$more.='</table>'."\n";
-		}
-
-		// JQUI method dialog is broken with jmobile, we use standard HTML.
-		// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
-		// See page product/card.php for example
-		if (! empty($conf->dol_use_jmobile)) $useajax=0;
-		if (empty($conf->use_javascript_ajax)) $useajax=0;
-
-		if ($useajax)
-		{
-			$autoOpen=true;
-			$dialogconfirm='dialog-confirm';
-			$button='';
-			if (! is_numeric($useajax))
-			{
-				$button=$useajax;
-				$useajax=1;
-				$autoOpen=false;
-				$dialogconfirm.='-'.$button;
-			}
-			$pageyes=$page.(preg_match('/\?/',$page)?'&':'?').'action='.$action.'&confirm=yes';
-			$pageno=($useajax == 2 ? $page.(preg_match('/\?/',$page)?'&':'?').'confirm=no':'');
-			// Add input fields into list of fields to read during submit (inputok and inputko)
-			if (is_array($formquestion))
-			{
-				foreach ($formquestion as $key => $input)
-				{
-					//print "xx ".$key." rr ".is_array($input)."<br>\n";
-					if (is_array($input) && isset($input['name'])) array_push($inputok,$input['name']);
-					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko,$input['name']);
-				}
-			}
-			// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
-			$formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
-			if (! empty($more)) {
-				$formconfirm.= '<div class="confirmquestions">'.$more.'</div>';
-			}
-			$formconfirm.= ($question ? '<div class="confirmmessage">'.img_help('','').' '.$question . '</div>': '');
-			$formconfirm.= '</div>'."\n";
-
-			$formconfirm.= "\n<!-- begin ajax formconfirm page=".$page." -->\n";
-			$formconfirm.= '<script type="text/javascript">'."\n";
-			$formconfirm.= 'jQuery(document).ready(function() {
-            $(function() {
-            	$( "#'.$dialogconfirm.'" ).dialog(
-            	{
-                    autoOpen: '.($autoOpen ? "true" : "false").',';
-			if ($newselectedchoice == 'no')
-			{
-				$formconfirm.='
-						open: function() {
-            				$(this).parent().find("button.ui-button:eq(2)").focus();
-						},';
-			}
-			$formconfirm.='
-                    resizable: false,
-                    height: "'.$height.'",
-                    width: "'.$width.'",
-                    modal: true,
-                    closeOnEscape: false,
-                    buttons: {
-                        "'.dol_escape_js($langs->transnoentities("Yes")).'": function() {
-                        	var options="";
-                        	var inputok = '.json_encode($inputok).';
-                         	var pageyes = "'.dol_escape_js(! empty($pageyes)?$pageyes:'').'";
-                         	if (inputok.length>0) {
-                         		$.each(inputok, function(i, inputname) {
-                         			var more = "";
-                         			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
-                         		    if ($("#" + inputname).attr("type") == "radio") { more = ":checked"; }
-                         			var inputvalue = $("#" + inputname + more).val();
-                         			if (typeof inputvalue == "undefined") { inputvalue=""; }
-                         			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
-                         		});
-                         	}
-                         	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options;
-                         	//alert(urljump);
-            				if (pageyes.length > 0) { location.href = urljump; }
-                            $(this).dialog("close");
-                        },
-                        "'.dol_escape_js($langs->transnoentities("No")).'": function() {
-                        	var options = "";
-                         	var inputko = '.json_encode($inputko).';
-                         	var pageno="'.dol_escape_js(! empty($pageno)?$pageno:'').'";
-                         	if (inputko.length>0) {
-                         		$.each(inputko, function(i, inputname) {
-                         			var more = "";
-                         			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
-                         			var inputvalue = $("#" + inputname + more).val();
-                         			if (typeof inputvalue == "undefined") { inputvalue=""; }
-                         			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
-                         		});
-                         	}
-                         	var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options;
-                         	//alert(urljump);
-            				if (pageno.length > 0) { location.href = urljump; }
-                            $(this).dialog("close");
+            $i = 0;
+            while ($num && $i < $num)
+            {
+                $opt = '';
+                $optJson = array();
+                $objp = $this->db->fetch_object($result);
+
+                if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1)
+                { // Price by quantity will return many prices for the same product
+                    $sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";
+                    $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+                    $sql.= " WHERE fk_product_price=".$objp->price_rowid;
+                    $sql.= " ORDER BY quantity ASC";
+
+                    dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
+                    $result2 = $this->db->query($sql);
+                    if ($result2)
+                    {
+                        $nb_prices = $this->db->num_rows($result2);
+                        $j = 0;
+                        while ($nb_prices && $j < $nb_prices) {
+                            $objp2 = $this->db->fetch_object($result2);
+
+                            $objp->price_by_qty_rowid = $objp2->rowid;
+                            $objp->price_by_qty_price_base_type = $objp2->price_base_type;
+                            $objp->price_by_qty_quantity = $objp2->quantity;
+                            $objp->price_by_qty_unitprice = $objp2->unitprice;
+                            $objp->price_by_qty_remise_percent = $objp2->remise_percent;
+                            // For backward compatibility
+                            $objp->quantity = $objp2->quantity;
+                            $objp->price = $objp2->price;
+                            $objp->unitprice = $objp2->unitprice;
+                            $objp->remise_percent = $objp2->remise_percent;
+                            $objp->remise = $objp2->remise;
+
+                            $this->constructProductListOption($objp, $opt, $optJson, 0, $selected, $hidepriceinlabel);
+
+                            $j++;
+
+                            // Add new entry
+                            // "key" value of json key array is used by jQuery automatically as selected value
+                            // "label" value of json key array is used by jQuery automatically as text for combo box
+                            $out.=$opt;
+                            array_push($outarray, $optJson);
                         }
                     }
                 }
-                );
-
-            	var button = "'.$button.'";
-            	if (button.length > 0) {
-                	$( "#" + button ).click(function() {
-                		$("#'.$dialogconfirm.'").dialog("open");
-        			});
+                else
+                {
+                    if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
+                        $price_product = new Product($this->db);
+                        $price_product->fetch($objp->rowid, '', '', 1);
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProduct($price_product);
+                        if ($price_result >= 0) {
+                            $objp->price = $price_result;
+                            $objp->unitprice = $price_result;
+                            //Calculate the VAT
+                            $objp->price_ttc = price2num($objp->price) * (1 + ($objp->tva_tx / 100));
+                            $objp->price_ttc = price2num($objp->price_ttc,'MU');
+                        }
+                    }
+                    $this->constructProductListOption($objp, $opt, $optJson, $price_level, $selected, $hidepriceinlabel);
+                    // Add new entry
+                    // "key" value of json key array is used by jQuery automatically as selected value
+                    // "label" value of json key array is used by jQuery automatically as text for combo box
+                    $out.=$opt;
+                    array_push($outarray, $optJson);
                 }
-            });
-            });
-            </script>';
-			$formconfirm.= "<!-- end ajax formconfirm -->\n";
-		}
-		else
-		{
-			$formconfirm.= "\n<!-- begin formconfirm page=".$page." -->\n";
-
-			if (empty($disableformtag)) $formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
 
-			$formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
-			if (empty($disableformtag)) $formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+                $i++;
+            }
 
-			$formconfirm.= '<table width="100%" class="valid">'."\n";
+            $out.='</select>';
 
-			// Line title
-			$formconfirm.= '<tr class="validtitre"><td class="validtitre" colspan="3">'.img_picto('','recent').' '.$title.'</td></tr>'."\n";
+            $this->db->free($result);
 
-			// Line form fields
-			if ($more)
-			{
-				$formconfirm.='<tr class="valid"><td class="valid" colspan="3">'."\n";
-				$formconfirm.=$more;
-				$formconfirm.='</td></tr>'."\n";
-			}
+            if (empty($outputmode)) return $out;
+            return $outarray;
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
 
-			// Line with question
-			$formconfirm.= '<tr class="valid">';
-			$formconfirm.= '<td class="valid">'.$question.'</td>';
-			$formconfirm.= '<td class="valid">';
-			$formconfirm.= $this->selectyesno("confirm",$newselectedchoice);
-			$formconfirm.= '</td>';
-			$formconfirm.= '<td class="valid" align="center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';
-			$formconfirm.= '</tr>'."\n";
+    /**
+     * constructProductListOption
+     *
+     * @param 	resultset	$objp			    Resultset of fetch
+     * @param 	string		$opt			    Option (var used for returned value in string option format)
+     * @param 	string		$optJson		    Option (var used for returned value in json format)
+     * @param 	int			$price_level	    Price level
+     * @param 	string		$selected		    Preselected value
+     * @param   int         $hidepriceinlabel   Hide price in label
+     * @return	void
+     */
+    private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel=0)
+    {
+        global $langs,$conf,$user,$db;
+
+        $outkey='';
+        $outval='';
+        $outref='';
+        $outlabel='';
+        $outdesc='';
+        $outbarcode='';
+        $outtype='';
+        $outprice_ht='';
+        $outprice_ttc='';
+        $outpricebasetype='';
+        $outtva_tx='';
+        $outqty=1;
+        $outdiscount=0;
+
+        $maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO);
+
+        $label=$objp->label;
+        if (! empty($objp->label_translated)) $label=$objp->label_translated;
+        if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
+
+        $outkey=$objp->rowid;
+        $outref=$objp->ref;
+        $outlabel=$objp->label;
+        $outdesc=$objp->description;
+        $outbarcode=$objp->barcode;
+
+        $outtype=$objp->fk_product_type;
+        $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
+        $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
+
+        $opt = '<option value="'.$objp->rowid.'"';
+        $opt.= ($objp->rowid == $selected)?' selected':'';
+        if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0)
+        {
+            $opt.= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';
+        }
+        if (! empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock))
+        {
+            if ($objp->stock > 0) $opt.= ' class="product_line_stock_ok"';
+            else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
+        }
+        $opt.= '>';
+        $opt.= $objp->ref;
+        if ($outbarcode) $opt.=' ('.$outbarcode.')';
+        $opt.=' - '.dol_trunc($label,$maxlengtharticle);
+
+        $objRef = $objp->ref;
+        if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
+        $outval.=$objRef;
+        if ($outbarcode) $outval.=' ('.$outbarcode.')';
+        $outval.=' - '.dol_trunc($label,$maxlengtharticle);
+
+        $found=0;
+
+        // Multiprice
+        // If we need a particular price level (from 1 to 6)
+        if (empty($hidepriceinlabel) && $price_level >= 1 && (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
+        {
+            $sql = "SELECT price, price_ttc, price_base_type, tva_tx";
+            $sql.= " FROM ".MAIN_DB_PREFIX."product_price";
+            $sql.= " WHERE fk_product='".$objp->rowid."'";
+            $sql.= " AND entity IN (".getEntity('productprice').")";
+            $sql.= " AND price_level=".$price_level;
+            $sql.= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
+            $sql.= " LIMIT 1";
+
+            dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);
+            $result2 = $this->db->query($sql);
+            if ($result2)
+            {
+                $objp2 = $this->db->fetch_object($result2);
+                if ($objp2)
+                {
+                    $found=1;
+                    if ($objp2->price_base_type == 'HT')
+                    {
+                        $opt.= ' - '.price($objp2->price,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
+                        $outval.= ' - '.price($objp2->price,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
+                    }
+                    else
+                    {
+                        $opt.= ' - '.price($objp2->price_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
+                        $outval.= ' - '.price($objp2->price_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
+                    }
+                    $outprice_ht=price($objp2->price);
+                    $outprice_ttc=price($objp2->price_ttc);
+                    $outpricebasetype=$objp2->price_base_type;
+                    $outtva_tx=$objp2->tva_tx;
+                }
+            }
+            else
+            {
+                dol_print_error($this->db);
+            }
+        }
 
-			$formconfirm.= '</table>'."\n";
+        // Price by quantity
+        if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
+        {
+            $found = 1;
+            $outqty=$objp->quantity;
+            $outdiscount=$objp->remise_percent;
+            if ($objp->quantity == 1)
+            {
+                $opt.= ' - '.price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/";
+                $outval.= ' - '.price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/";
+                $opt.= $langs->trans("Unit");	// Do not use strtolower because it breaks utf8 encoding
+                $outval.=$langs->transnoentities("Unit");
+            }
+            else
+            {
+                $opt.= ' - '.price($objp->price,1,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
+                $outval.= ' - '.price($objp->price,0,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
+                $opt.= $langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
+                $outval.=$langs->transnoentities("Units");
+            }
 
-			if (empty($disableformtag)) $formconfirm.= "</form>\n";
-			$formconfirm.= '<br>';
+            $outprice_ht=price($objp->unitprice);
+            $outprice_ttc=price($objp->unitprice * (1 + ($objp->tva_tx / 100)));
+            $outpricebasetype=$objp->price_base_type;
+            $outtva_tx=$objp->tva_tx;
+        }
+        if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1)
+        {
+            $opt.=" (".price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
+            $outval.=" (".price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->transnoentities("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
+        }
+        if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1)
+        {
+            $opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
+            $outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
+        }
 
-			$formconfirm.= "<!-- end formconfirm -->\n";
-		}
+        // Price by customer
+        if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+        {
+            if (!empty($objp->idprodcustprice))
+            {
+                $found = 1;
 
-		return $formconfirm;
-	}
+                if ($objp->custprice_base_type == 'HT')
+                {
+                    $opt.= ' - '.price($objp->custprice,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
+                    $outval.= ' - '.price($objp->custprice,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
+                }
+                else
+                {
+                    $opt.= ' - '.price($objp->custprice_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
+                    $outval.= ' - '.price($objp->custprice_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
+                }
 
+                $outprice_ht=price($objp->custprice);
+                $outprice_ttc=price($objp->custprice_ttc);
+                $outpricebasetype=$objp->custprice_base_type;
+                $outtva_tx=$objp->custtva_tx;
+            }
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Show a form to select a project
-	 *
-	 *    @param	int		$page        		Page
-	 *    @param	int		$socid       		Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 *    @param    int		$selected    		Id pre-selected project
-	 *    @param    string	$htmlname    		Name of select field
-	 *    @param	int		$discard_closed		Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
-	 *    @param	int		$maxlength			Max length
-	 *    @param	int		$forcefocus			Force focus on field (works with javascript only)
-	 *    @param    int     $nooutput           No print is done. String is returned.
-	 *    @return	string                      Return html content
-	 */
-	function form_project($page, $socid, $selected='', $htmlname='projectid', $discard_closed=0, $maxlength=20, $forcefocus=0, $nooutput=0)
-	{
-        // phpcs:enable
-		global $langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-
-		$out='';
-
-		$formproject=new FormProjets($this->db);
-
-		$langs->load("project");
-		if ($htmlname != "none")
-		{
-			$out.="\n";
-			$out.='<form method="post" action="'.$page.'">';
-			$out.='<input type="hidden" name="action" value="classin">';
-			$out.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$out.=$formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
-			$out.='<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			$out.='</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				$projet = new Project($this->db);
-				$projet->fetch($selected);
-				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
-				$out.=$projet->getNomUrl(0,'',1);
-			}
-			else
-			{
-				$out.="&nbsp;";
-			}
-		}
-
-		if (empty($nooutput))
-		{
-			print $out;
-			return '';
-		}
-		return $out;
-	}
+        // If level no defined or multiprice not found, we used the default price
+        if (empty($hidepriceinlabel) && ! $found)
+        {
+            if ($objp->price_base_type == 'HT')
+            {
+                $opt.= ' - '.price($objp->price,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
+                $outval.= ' - '.price($objp->price,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
+            }
+            else
+            {
+                $opt.= ' - '.price($objp->price_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
+                $outval.= ' - '.price($objp->price_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
+            }
+            $outprice_ht=price($objp->price);
+            $outprice_ttc=price($objp->price_ttc);
+            $outpricebasetype=$objp->price_base_type;
+            $outtva_tx=$objp->tva_tx;
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a form to select payment conditions
-	 *
-	 *  @param	int		$page        	Page
-	 *  @param  string	$selected    	Id condition pre-selectionne
-	 *  @param  string	$htmlname    	Name of select html field
-	 *	@param	int		$addempty		Add empty entry
-	 *  @return	void
-	 */
-	function form_conditions_reglement($page, $selected='', $htmlname='cond_reglement_id', $addempty=0)
-	{
-        // phpcs:enable
-		global $langs;
-		if ($htmlname != "none")
-		{
-			print '<form method="post" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setconditions">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$this->select_conditions_paiements($selected,$htmlname,-1,$addempty);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				$this->load_cache_conditions_paiements();
-				print $this->cache_conditions_paiements[$selected]['label'];
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
+        if (! empty($conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0)
+        {
+            $opt.= ' - '.$langs->trans("Stock").':'.$objp->stock;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show a form to select a delivery delay
-	 *
-	 *  @param  int		$page        	Page
-	 *  @param  string	$selected    	Id condition pre-selectionne
-	 *  @param  string	$htmlname    	Name of select html field
-	 *	@param	int		$addempty		Ajoute entree vide
-	 *  @return	void
-	 */
-	function form_availability($page, $selected='', $htmlname='availability', $addempty=0)
-	{
-        // phpcs:enable
-		global $langs;
-		if ($htmlname != "none")
-		{
-			print '<form method="post" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setavailability">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$this->selectAvailabilityDelay($selected,$htmlname,-1,$addempty);
-			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				$this->load_cache_availability();
-				print $this->cache_availability[$selected]['label'];
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
-
-	/**
-	 *	Output HTML form to select list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
-	 *  List found into table c_input_reason loaded by loadCacheInputReason
-	 *
-	 *  @param  string	$page        	Page
-	 *  @param  string	$selected    	Id condition pre-selectionne
-	 *  @param  string	$htmlname    	Name of select html field
-	 *	@param	int		$addempty		Add empty entry
-	 *  @return	void
-	 */
-	function formInputReason($page, $selected='', $htmlname='demandreason', $addempty=0)
-	{
-		global $langs;
-		if ($htmlname != "none")
-		{
-			print '<form method="post" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setdemandreason">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$this->selectInputReason($selected,$htmlname,-1,$addempty);
-			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				$this->loadCacheInputReason();
-				foreach ($this->cache_demand_reason as $key => $val)
-				{
-					if ($val['id'] == $selected)
-					{
-						print $val['label'];
-						break;
-					}
-				}
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
+            if ($objp->stock > 0) {
+                $outval.= ' - <span class="product_line_stock_ok">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';
+            }elseif ($objp->stock <= 0) {
+                $outval.= ' - <span class="product_line_stock_too_low">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';
+            }
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Show a form + html select a date
-	 *
-	 *    @param	string		$page        	Page
-	 *    @param	string		$selected    	Date preselected
-	 *    @param    string		$htmlname    	Html name of date input fields or 'none'
-	 *    @param    int			$displayhour 	Display hour selector
-	 *    @param    int			$displaymin		Display minutes selector
-	 *    @param	int			$nooutput		1=No print output, return string
-	 *    @return	string
-	 *    @see		selectDate
-	 */
-	function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $nooutput=0)
-	{
-        // phpcs:enable
-		global $langs;
-
-		$ret='';
-
-		if ($htmlname != "none")
-		{
-			$ret.='<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
-			$ret.='<input type="hidden" name="action" value="set'.$htmlname.'">';
-			$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$ret.='<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-			$ret.='<tr><td>';
-			$ret.=$this->selectDate($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0);
-			$ret.='</td>';
-			$ret.='<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			$ret.='</tr></table></form>';
-		}
-		else
-		{
-			if ($displayhour) $ret.=dol_print_date($selected,'dayhour');
-			else $ret.=dol_print_date($selected,'day');
-		}
-
-		if (empty($nooutput)) print $ret;
-		return $ret;
-	}
+        if ($outdurationvalue && $outdurationunit)
+        {
+            $da=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+            if (isset($da[$outdurationunit]))
+            {
+                $key = $da[$outdurationunit].($outdurationvalue > 1?'s':'');
+                $opt.= ' - '.$outdurationvalue.' '.$langs->trans($key);
+                $outval.=' - '.$outdurationvalue.' '.$langs->transnoentities($key);
+            }
+        }
 
+        $opt.= "</option>\n";
+        $optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show a select form to choose a user
-	 *
-	 *  @param	string	$page        	Page
-	 *  @param  string	$selected    	Id of user preselected
-	 *  @param  string	$htmlname    	Name of input html field. If 'none', we just output the user link.
-	 *  @param  array	$exclude		List of users id to exclude
-	 *  @param  array	$include        List of users id to include
-	 *  @return	void
-	 */
-	function form_users($page, $selected='', $htmlname='userid', $exclude='', $include='')
-	{
+    /**
+     *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)
+     *
+     *	@param	int		$socid			Id third party
+     *	@param  string	$selected       Preselected product
+     *	@param  string	$htmlname       Name of HTML Select
+     *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
+     *	@param  string	$filtre			For a SQL filter
+     *	@param	array	$ajaxoptions	Options for ajax_autocompleter
+     *  @param	int		$hidelabel		Hide label (0=no, 1=yes)
+     *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
+     *	@return	void
+     */
+    function select_produits_fournisseurs($socid, $selected='', $htmlname='productid', $filtertype='', $filtre='', $ajaxoptions=array(), $hidelabel=0, $alsoproductwithnosupplierprice=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		if ($htmlname != "none")
-		{
-			print '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';
-			print '<input type="hidden" name="action" value="set'.$htmlname.'">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print $this->select_dolusers($selected,$htmlname,1,$exclude,0,$include);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
-				$theuser=new User($this->db);
-				$theuser->fetch($selected);
-				print $theuser->getNomUrl(1);
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
+        global $langs,$conf;
+        global $price_level, $status, $finished;
 
+        $selected_input_value='';
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
+        {
+            if ($selected > 0)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                $producttmpselect = new Product($this->db);
+                $producttmpselect->fetch($selected);
+                $selected_input_value=$producttmpselect->ref;
+                unset($producttmpselect);
+            }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Show form with payment mode
-	 *
-	 *    @param	string	$page        	Page
-	 *    @param    int		$selected    	Id mode pre-selectionne
-	 *    @param    string	$htmlname    	Name of select html field
-	 *    @param  	string	$filtertype		To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))
-	 *    @param    int     $active         Active or not, -1 = all
-	 *    @return	void
-	 */
-	function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id', $filtertype='', $active=1)
-	{
-        // phpcs:enable
-		global $langs;
-		if ($htmlname != "none")
-		{
-			print '<form method="POST" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setmode">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$this->select_types_paiements($selected,$htmlname,$filtertype,0,0,0,0,$active);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				$this->load_cache_types_paiements();
-				print $this->cache_types_paiements[$selected]['label'];
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
+            // mode=2 means suppliers products
+            $urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
+            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
+        }
+        else
+        {
+            print $this->select_produits_fournisseurs_list($socid,$selected,$htmlname,$filtertype,$filtre,'',-1,0,0,$alsoproductwithnosupplierprice);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Show form with multicurrency code
-	 *
-	 *    @param	string	$page        	Page
-	 *    @param    string	$selected    	code pre-selectionne
-	 *    @param    string	$htmlname    	Name of select html field
-	 *    @return	void
-	 */
-	function form_multicurrency_code($page, $selected='', $htmlname='multicurrency_code')
-	{
+    /**
+     *	Return list of suppliers products
+     *
+     *	@param	int		$socid   		Id societe fournisseur (0 pour aucun filtre)
+     *	@param  int		$selected       Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
+     *	@param  string	$htmlname       Nom de la zone select
+     *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
+     *	@param  string	$filtre         Pour filtre sql
+     *	@param  string	$filterkey      Filtre des produits
+     *  @param  int		$statut         -1=Return all products, 0=Products not on sell, 1=Products on sell (not used here, a filter on tobuy is already hard coded in request)
+     *  @param  int		$outputmode     0=HTML select string, 1=Array
+     *  @param  int     $limit          Limit of line number
+     *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
+     *  @return array           		Array of keys for json
+     */
+    function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0,$limit=100,$alsoproductwithnosupplierprice=0)
+    {
         // phpcs:enable
-		global $langs;
-		if ($htmlname != "none")
-		{
-			print '<form method="POST" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setmulticurrencycode">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print $this->selectMultiCurrency($selected, $htmlname, 0);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			dol_include_once('/core/lib/company.lib.php');
-			print !empty($selected) ? currency_name($selected,1) : '&nbsp;';
-		}
-	}
+        global $langs,$conf,$db;
+
+        $out='';
+        $outarray=array();
+
+        $langs->load('stocks');
+
+        $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, p.fk_product_type,";
+        $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
+        $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
+        $sql.= " pfp.supplier_reputation";
+        $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+        if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+        $sql.= " WHERE p.entity IN (".getEntity('product').")";
+        $sql.= " AND p.tobuy = 1";
+        if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
+        if (! empty($filtre)) $sql.=" ".$filtre;
+        // Add criteria on ref/label
+        if ($filterkey != '')
+        {
+            $sql.=' AND (';
+            $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+            // For natural search
+            $scrit = explode(' ', $filterkey);
+            $i=0;
+            if (count($scrit) > 1) $sql.="(";
+            foreach ($scrit as $crit)
+            {
+                if ($i > 0) $sql.=" AND ";
+                $sql.="(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
+                $i++;
+            }
+            if (count($scrit) > 1) $sql.=")";
+            if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+            $sql.=')';
+        }
+        $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
+        $sql.= $db->plimit($limit, 0);
+
+        // Build output string
+
+        dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+
+            $num = $this->db->num_rows($result);
+
+            //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
+            $out.='<select class="flat maxwidthonsmartphone" id="'.$htmlname.'" name="'.$htmlname.'">';
+            if (! $selected) $out.='<option value="0" selected>&nbsp;</option>';
+            else $out.='<option value="0">&nbsp;</option>';
+
+            $i = 0;
+            while ($i < $num)
+            {
+                $objp = $this->db->fetch_object($result);
+
+                $outkey=$objp->idprodfournprice;                                                    // id in table of price
+                if (! $outkey && $alsoproductwithnosupplierprice) $outkey='idprod_'.$objp->rowid;   // id of product
+
+                $outref=$objp->ref;
+                $outval='';
+                $outqty=1;
+                $outdiscount=0;
+                $outtype=$objp->fk_product_type;
+                $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
+                $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
+
+                $opt = '<option value="'.$outkey.'"';
+                if ($selected && $selected == $objp->idprodfournprice) $opt.= ' selected';
+                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt.=' disabled';
+                if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
+                {
+                    $opt.= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqpercent="'.$objp->remise_percent.'"';
+                }
+                $opt.= '>';
+
+                $objRef = $objp->ref;
+                if ($filterkey && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
+                $objRefFourn = $objp->ref_fourn;
+                if ($filterkey && $filterkey != '') $objRefFourn=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRefFourn,1);
+                $label = $objp->label;
+                if ($filterkey && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
+
+                $opt.=$objp->ref;
+                if (! empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
+                    $opt.=' ('.$objp->ref_fourn.')';
+                $opt.=' - ';
+                $outval.=$objRef;
+                if (! empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))
+                    $outval.=' ('.$objRefFourn.')';
+                $outval.=' - ';
+                $opt.=dol_trunc($label, 72).' - ';
+                $outval.=dol_trunc($label, 72).' - ';
+
+                if (! empty($objp->idprodfournprice))
+                {
+                    $outqty=$objp->quantity;
+                    $outdiscount=$objp->remise_percent;
+                    if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
+                        $prod_supplier = new ProductFournisseur($this->db);
+                        $prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
+                        $prod_supplier->id = $objp->fk_product;
+                        $prod_supplier->fourn_qty = $objp->quantity;
+                        $prod_supplier->fourn_tva_tx = $objp->tva_tx;
+                        $prod_supplier->fk_supplier_price_expression = $objp->fk_supplier_price_expression;
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
+                        if ($price_result >= 0) {
+                            $objp->fprice = $price_result;
+                            if ($objp->quantity >= 1)
+                            {
+                                $objp->unitprice = $objp->fprice / $objp->quantity;
+                            }
+                        }
+                    }
+                    if ($objp->quantity == 1)
+                    {
+                        $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
+                        $outval.= price($objp->fprice,0,$langs,0,0,-1,$conf->currency)."/";
+                        $opt.= $langs->trans("Unit");	// Do not use strtolower because it breaks utf8 encoding
+                        $outval.=$langs->transnoentities("Unit");
+                    }
+                    else
+                    {
+                        $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
+                        $outval.= price($objp->fprice,0,$langs,0,0,-1,$conf->currency)."/".$objp->quantity;
+                        $opt.= ' '.$langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
+                        $outval.= ' '.$langs->transnoentities("Units");
+                    }
+
+                    if ($objp->quantity >= 1)
+                    {
+                        $opt.=" (".price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
+                        $outval.=" (".price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->transnoentities("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
+                    }
+                    if ($objp->remise_percent >= 1)
+                    {
+                        $opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
+                        $outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
+                    }
+                    if ($objp->duration)
+                    {
+                        $opt .= " - ".$objp->duration;
+                        $outval.=" - ".$objp->duration;
+                    }
+                    if (! $socid)
+                    {
+                        $opt .= " - ".dol_trunc($objp->name,8);
+                        $outval.=" - ".dol_trunc($objp->name,8);
+                    }
+                    if ($objp->supplier_reputation)
+                    {
+                        //TODO dictionary
+                        $reputations=array(''=>$langs->trans('Standard'),'FAVORITE'=>$langs->trans('Favorite'),'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
+
+                        $opt .= " - ".$reputations[$objp->supplier_reputation];
+                        $outval.=" - ".$reputations[$objp->supplier_reputation];
+                    }
+                }
+                else
+                {
+                    if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
+                    {
+                        $opt.= $langs->trans("NoPriceDefinedForThisSupplier");
+                        $outval.=$langs->transnoentities("NoPriceDefinedForThisSupplier");
+                    }
+                    else                                            // No supplier price defined for product, even on other suppliers
+                    {
+                        $opt.= $langs->trans("NoPriceDefinedForThisSupplier");
+                        $outval.=$langs->transnoentities("NoPriceDefinedForThisSupplier");
+                    }
+                }
+                $opt .= "</option>\n";
+
+
+                // Add new entry
+                // "key" value of json key array is used by jQuery automatically as selected value
+                // "label" value of json key array is used by jQuery automatically as text for combo box
+                $out.=$opt;
+                array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
+                // Exemple of var_dump $outarray
+                // array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
+                //           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
+                //      	 ["qty"]=>string(1) "1" ["discount"]=>string(1) "0" ["disabled"]=>bool(false)
+                //}
+                //var_dump($outval); var_dump(utf8_check($outval)); var_dump(json_encode($outval));
+                //$outval=array('label'=>'ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/ Unité (20,00 Euros/unité)');
+                //var_dump($outval); var_dump(utf8_check($outval)); var_dump(json_encode($outval));
+
+                $i++;
+            }
+            $out.='</select>';
+
+            $this->db->free($result);
+
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out.=ajax_combobox($htmlname);
+
+            if (empty($outputmode)) return $out;
+            return $outarray;
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Show form with multicurrency rate
-	 *
-	 *    @param	string	$page        	Page
-	 *    @param    double	$rate	    	Current rate
-	 *    @param    string	$htmlname    	Name of select html field
-	 *    @param    string  $currency       Currency code to explain the rate
-	 *    @return	void
-	 */
-	function form_multicurrency_rate($page, $rate='', $htmlname='multicurrency_tx', $currency='')
-	{
+    /**
+     *	Return list of suppliers prices for a product
+     *
+     *  @param	    int		$productid       	Id of product
+     *  @param      string	$htmlname        	Name of HTML field
+     *  @param      int		$selected_supplier  Pre-selected supplier if more than 1 result
+     *  @return	    void
+     */
+    function select_product_fourn_price($productid, $htmlname='productfournpriceid', $selected_supplier='')
+    {
         // phpcs:enable
-		global $langs, $mysoc, $conf;
-
-		if ($htmlname != "none")
-		{
-			print '<form method="POST" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setmulticurrencyrate">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? price($rate) : 1).'" size="10" /> ';
-			print '<select name="calculation_mode">';
-			print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';
-			print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';
-			print '</select> ';
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			print '</form>';
-		}
-		else
-		{
-			if (! empty($rate))
-			{
-				print price($rate, 1, $langs, 1, 0);
-				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
-			}
-			else
-			{
-				print 1;
-			}
-		}
-	}
+        global $langs,$conf;
+
+        $langs->load('stocks');
+
+        $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, pfp.fk_soc,";
+        $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";
+        $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
+        $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+        $sql.= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
+        $sql.= " AND p.tobuy = 1";
+        $sql.= " AND s.fournisseur = 1";
+        $sql.= " AND p.rowid = ".$productid;
+        $sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
+
+        dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
+        $result=$this->db->query($sql);
+
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+
+            $form = '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+
+            if (! $num)
+            {
+                $form.= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
+            }
+            else
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+                $form.= '<option value="0">&nbsp;</option>';
+
+                $i = 0;
+                while ($i < $num)
+                {
+                    $objp = $this->db->fetch_object($result);
+
+                    $opt = '<option value="'.$objp->idprodfournprice.'"';
+                    //if there is only one supplier, preselect it
+                    if($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {
+                        $opt .= ' selected';
+                    }
+                    $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
+
+                    if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
+                        $prod_supplier = new ProductFournisseur($this->db);
+                        $prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
+                        $prod_supplier->id = $productid;
+                        $prod_supplier->fourn_qty = $objp->quantity;
+                        $prod_supplier->fourn_tva_tx = $objp->tva_tx;
+                        $prod_supplier->fk_supplier_price_expression = $objp->fk_supplier_price_expression;
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
+                        if ($price_result >= 0) {
+                            $objp->fprice = $price_result;
+                            if ($objp->quantity >= 1)
+                            {
+                                $objp->unitprice = $objp->fprice / $objp->quantity;
+                            }
+                        }
+                    }
+                    if ($objp->quantity == 1)
+                    {
+                        $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
+                    }
+
+                    $opt.= $objp->quantity.' ';
+
+                    if ($objp->quantity == 1)
+                    {
+                        $opt.= $langs->trans("Unit");
+                    }
+                    else
+                    {
+                        $opt.= $langs->trans("Units");
+                    }
+                    if ($objp->quantity > 1)
+                    {
+                        $opt.=" - ";
+                        $opt.= price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
+                    }
+                    if ($objp->duration) $opt .= " - ".$objp->duration;
+                    $opt .= "</option>\n";
+
+                    $form.= $opt;
+                    $i++;
+                }
+            }
 
+            $form.= '</select>';
+            $this->db->free($result);
+            return $form;
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a select box with available absolute discounts
-	 *
-	 *  @param  string	$page        	Page URL where form is shown
-	 *  @param  int		$selected    	Value pre-selected
-	 *	@param  string	$htmlname    	Name of SELECT component. If 'none', not changeable. Example 'remise_id'.
-	 *	@param	int		$socid			Third party id
-	 * 	@param	float	$amount			Total amount available
-	 * 	@param	string	$filter			SQL filter on discounts
-	 * 	@param	int		$maxvalue		Max value for lines that can be selected
-	 *  @param  string	$more           More string to add
-	 *  @param  int     $hidelist       1=Hide list
-	 *  @param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *  @return	void
-	 */
-	function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0, $discount_type=0)
-	{
+    /**
+     *    Return list of delivery address
+     *
+     *    @param    string	$selected          	Id contact pre-selectionn
+     *    @param    int		$socid				Id of company
+     *    @param    string	$htmlname          	Name of HTML field
+     *    @param    int		$showempty         	Add an empty field
+     *    @return	integer|null
+     */
+    function select_address($selected, $socid, $htmlname='address_id',$showempty=0)
+    {
         // phpcs:enable
-		global $conf,$langs;
-		if ($htmlname != "none")
-		{
-			print '<form method="post" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setabsolutediscount">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<div class="inline-block">';
-			if(! empty($discount_type)) {
-				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-				{
-					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice
-					else $translationKey = 'HasCreditNoteFromSupplier';
-				}
-				else
-				{
-					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
-					else $translationKey = 'HasCreditNoteFromSupplier';
-				}
-			} else {
-				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-				{
-					if (! $filter || $filter=="fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice
-					else $translationKey = 'CompanyHasCreditNote';
-				}
-				else
-				{
-					if (! $filter || $filter=="fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
-					else $translationKey = 'CompanyHasCreditNote';
-				}
-			}
-			print $langs->trans($translationKey,price($amount,0,$langs,0,0,-1,$conf->currency));
-			if (empty($hidelist)) print ': ';
-			print '</div>';
-			if (empty($hidelist))
-			{
-				print '<div class="inline-block" style="padding-right: 10px">';
-				$newfilter = 'discount_type='.intval($discount_type);
-				if(! empty($discount_type)) {
-					$newfilter.= ' AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Supplier discounts available
-				} else {
-					$newfilter.= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available
-				}
-				if ($filter) $newfilter.=' AND ('.$filter.')';
-				$nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue);
-				if ($nbqualifiedlines > 0)
-				{
-					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
-					if(! empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
-						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
-					if(empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
-						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
-
-					print '>';
-				}
-				print '</div>';
-			}
-			if ($more)
-			{
-				print '<div class="inline-block">';
-				print $more;
-				print '</div>';
-			}
-			print '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				print $selected;
-			}
-			else
-			{
-				print "0";
-			}
-		}
-	}
+        // looking for users
+        $sql = "SELECT a.rowid, a.label";
+        $sql .= " FROM ".MAIN_DB_PREFIX ."societe_address as a";
+        $sql .= " WHERE a.fk_soc = ".$socid;
+        $sql .= " ORDER BY a.label ASC";
+
+        dol_syslog(get_class($this)."::select_address", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+            if ($showempty) print '<option value="0">&nbsp;</option>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    if ($selected && $selected == $obj->rowid)
+                    {
+                        print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
+                    }
+                    $i++;
+                }
+            }
+            print '</select>';
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Show forms to select a contact
-	 *
-	 *    @param	string		$page        	Page
-	 *    @param	Societe		$societe		Filter on third party
-	 *    @param    int			$selected    	Id contact pre-selectionne
-	 *    @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.
-	 *    @return	void
-	 */
-	function form_contacts($page, $societe, $selected='', $htmlname='contactid')
-	{
+    /**
+     *      Load into cache list of payment terms
+     *
+     *      @return     int             Nb of lines loaded, <0 if KO
+     */
+    function load_cache_conditions_paiements()
+    {
         // phpcs:enable
-		global $langs, $conf;
-
-		if ($htmlname != "none")
-		{
-			print '<form method="post" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="set_contact">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-			print '<tr><td>';
-			$num=$this->select_contacts($societe->id, $selected, $htmlname);
-			if ($num==0)
-			{
-				$addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-				print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';
-			}
-			print '</td>';
-			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			print '</tr></table></form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
-				$contact=new Contact($this->db);
-				$contact->fetch($selected);
-				print $contact->getFullName($langs);
-			} else {
-				print "&nbsp;";
-			}
-		}
-	}
+        global $langs;
+
+        $num = count($this->cache_conditions_paiements);
+        if ($num > 0) return 0;    // Cache already loaded
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = "SELECT rowid, code, libelle as label";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
+        $sql.= " WHERE entity IN (".getEntity('c_payment_term').")";
+        $sql.= " AND active > 0";
+        $sql.= " ORDER BY sortorder";
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                $label=($langs->trans("PaymentConditionShort".$obj->code)!=("PaymentConditionShort".$obj->code)?$langs->trans("PaymentConditionShort".$obj->code):($obj->label!='-'?$obj->label:''));
+                $this->cache_conditions_paiements[$obj->rowid]['code'] =$obj->code;
+                $this->cache_conditions_paiements[$obj->rowid]['label']=$label;
+                $i++;
+            }
+
+            //$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
+
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Output html select to select thirdparty
-	 *
-	 *  @param	string	$page       	Page
-	 *  @param  string	$selected   	Id preselected
-	 *  @param  string	$htmlname		Name of HTML select
-	 *  @param  string	$filter         optional filters criteras
-	 *	@param	int		$showempty		Add an empty field
-	 * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
-	 * 	@param	int		$forcecombo		Force to use combo box
-	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 *  @param  int     $nooutput       No print output. Return it only.
-	 *  @return	void
-	 */
-	function form_thirdparty($page, $selected='', $htmlname='socid', $filter='',$showempty=0, $showtype=0, $forcecombo=0, $events=array(), $nooutput=0)
-	{
+    /**
+     *      Charge dans cache la liste des délais de livraison possibles
+     *
+     *      @return     int             Nb of lines loaded, <0 if KO
+     */
+    function load_cache_availability()
+    {
         // phpcs:enable
-		global $langs;
-
-		$out = '';
-		if ($htmlname != "none")
-		{
-			$out.='<form method="post" action="'.$page.'">';
-			$out.= '<input type="hidden" name="action" value="set_thirdparty">';
-			$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$out.= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
-			$out.= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			$out.= '</form>';
-		}
-		else
-		{
-			if ($selected)
-			{
-				require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
-				$soc = new Societe($this->db);
-				$soc->fetch($selected);
-				$out.= $soc->getNomUrl($langs);
-			}
-			else
-			{
-				$out.= "&nbsp;";
-			}
-		}
-
-		if ($nooutput) return $out;
-		else print $out;
-	}
+        global $langs;
+
+        $num = count($this->cache_availability);
+        if ($num > 0) return 0;    // Cache already loaded
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $langs->load('propal');
+
+        $sql = "SELECT rowid, code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_availability';
+        $sql.= " WHERE active > 0";
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                $label=($langs->trans("AvailabilityType".$obj->code)!=("AvailabilityType".$obj->code)?$langs->trans("AvailabilityType".$obj->code):($obj->label!='-'?$obj->label:''));
+                $this->cache_availability[$obj->rowid]['code'] =$obj->code;
+                $this->cache_availability[$obj->rowid]['label']=$label;
+                $i++;
+            }
+
+            $this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
+
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *      Retourne la liste des types de delais de livraison possibles
+     *
+     *      @param	int		$selected        Id du type de delais pre-selectionne
+     *      @param  string	$htmlname        Nom de la zone select
+     *      @param  string	$filtertype      To add a filter
+     *		@param	int		$addempty		Add empty entry
+     *		@return	void
+     */
+    function selectAvailabilityDelay($selected='',$htmlname='availid',$filtertype='',$addempty=0)
+    {
+        global $langs,$user;
+
+        $this->load_cache_availability();
+
+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
+
+        print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
+        if ($addempty) print '<option value="0">&nbsp;</option>';
+        foreach($this->cache_availability as $id => $arrayavailability)
+        {
+            if ($selected == $id)
+            {
+                print '<option value="'.$id.'" selected>';
+            }
+            else
+            {
+                print '<option value="'.$id.'">';
+            }
+            print $arrayavailability['label'];
+            print '</option>';
+        }
+        print '</select>';
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    }
+
+    /**
+     *      Load into cache cache_demand_reason, array of input reasons
+     *
+     *      @return     int             Nb of lines loaded, <0 if KO
+     */
+    function loadCacheInputReason()
+    {
+        global $langs;
+
+        $num = count($this->cache_demand_reason);
+        if ($num > 0) return 0;    // Cache already loaded
+
+        $sql = "SELECT rowid, code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
+        $sql.= " WHERE active > 0";
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            $tmparray=array();
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                $label=($obj->label!='-'?$obj->label:'');
+                if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work
+                if ($langs->trans($obj->code) != $obj->code) $label=$langs->trans($obj->code);																// So translation key SRC_XXX will work
+
+                $tmparray[$obj->rowid]['id']   =$obj->rowid;
+                $tmparray[$obj->rowid]['code'] =$obj->code;
+                $tmparray[$obj->rowid]['label']=$label;
+                $i++;
+            }
+
+            $this->cache_demand_reason=dol_sort_array($tmparray, 'label', 'asc', 0, 0, 1);
+
+            unset($tmparray);
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *	Return list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
+     *  List found into table c_input_reason loaded by loadCacheInputReason
+     *
+     *  @param	int		$selected        Id or code of type origin to select by default
+     *  @param  string	$htmlname        Nom de la zone select
+     *  @param  string	$exclude         To exclude a code value (Example: SRC_PROP)
+     *	@param	int		$addempty		 Add an empty entry
+     *	@return	void
+     */
+    function selectInputReason($selected='',$htmlname='demandreasonid',$exclude='',$addempty=0)
+    {
+        global $langs,$user;
+
+        $this->loadCacheInputReason();
+
+        print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+        if ($addempty) print '<option value="0"'.(empty($selected)?' selected':'').'>&nbsp;</option>';
+        foreach($this->cache_demand_reason as $id => $arraydemandreason)
+        {
+            if ($arraydemandreason['code']==$exclude) continue;
+
+            if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
+            {
+                print '<option value="'.$arraydemandreason['id'].'" selected>';
+            }
+            else
+            {
+                print '<option value="'.$arraydemandreason['id'].'">';
+            }
+            $label=$arraydemandreason['label'];	// Translation of label was already done into the ->loadCacheInputReason
+            print $langs->trans($label);
+            print '</option>';
+        }
+        print '</select>';
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste des devises, dans la langue de l'utilisateur
-	 *
-	 *    @param	string	$selected    preselected currency code
-	 *    @param    string	$htmlname    name of HTML select list
-     *    @deprecated
-	 *    @return	void
-	 */
-	function select_currency($selected='',$htmlname='currency_id')
-	{
+    /**
+     *      Charge dans cache la liste des types de paiements possibles
+     *
+     *      @return     int                 Nb of lines loaded, <0 if KO
+     */
+    function load_cache_types_paiements()
+    {
         // phpcs:enable
-		print $this->selectCurrency($selected,$htmlname);
-	}
-
-	/**
-	 *  Retourne la liste des devises, dans la langue de l'utilisateur
-	 *
-	 *  @param	string	$selected    preselected currency code
-	 *  @param  string	$htmlname    name of HTML select list
-	 * 	@return	string
-	 */
-	function selectCurrency($selected='',$htmlname='currency_id')
-	{
-		global $conf,$langs,$user;
-
-		$langs->loadCacheCurrencies('');
-
-		$out='';
-
-		if ($selected=='euro' || $selected=='euros') $selected='EUR';   // Pour compatibilite
-
-		$out.= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
-		foreach ($langs->cache_currencies as $code_iso => $currency)
-		{
-			if ($selected && $selected == $code_iso)
-			{
-				$out.= '<option value="'.$code_iso.'" selected>';
-			}
-			else
-			{
-				$out.= '<option value="'.$code_iso.'">';
-			}
-			$out.= $currency['label'];
-			$out.= ' ('.$langs->getCurrencySymbol($code_iso).')';
-			$out.= '</option>';
-		}
-		$out.= '</select>';
-		if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-
-		// Make select dynamic
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-		$out .= ajax_combobox($htmlname);
-
-		return $out;
-	}
-
-	/**
-	 *	Return array of currencies in user language
-	 *
-	 *  @param	string	$selected    preselected currency code
-	 *  @param  string	$htmlname    name of HTML select list
-	 *  @param  integer	$useempty    1=Add empty line
-	 * 	@return	string
-	 */
-	function selectMultiCurrency($selected='', $htmlname='multicurrency_code', $useempty=0)
-	{
-		global $db,$conf,$langs,$user;
-
-		$langs->loadCacheCurrencies('');        // Load ->cache_currencies
-
-		$TCurrency = array();
-
-		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
-		}
-
-		$out='';
-		$out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-		if ($useempty) $out .= '<option value=""></option>';
-		// If company current currency not in table, we add it into list. Should always be available.
-		if (! in_array($conf->currency, $TCurrency))
-		{
-			$TCurrency[$conf->currency] = $conf->currency;
-		}
-		if (count($TCurrency) > 0)
-		{
-			foreach ($langs->cache_currencies as $code_iso => $currency)
-			{
-				if (isset($TCurrency[$code_iso]))
-				{
-					if (!empty($selected) && $selected == $code_iso) $out.= '<option value="'.$code_iso.'" selected="selected">';
-					else $out.= '<option value="'.$code_iso.'">';
-
-					$out.= $currency['label'];
-					$out.= ' ('.$langs->getCurrencySymbol($code_iso).')';
-					$out.= '</option>';
-				}
-			}
-		}
-
-		$out.= '</select>';
-		// Make select dynamic
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-		$out.= ajax_combobox($htmlname);
-
-		return $out;
-	}
+        global $langs;
+
+        $num=count($this->cache_types_paiements);
+        if ($num > 0) return $num;    // Cache already loaded
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $this->cache_types_paiements = array();
+
+        $sql = "SELECT id, code, libelle as label, type, active";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
+        $sql.= " WHERE entity IN (".getEntity('c_paiement').")";
+        //if ($active >= 0) $sql.= " AND active = ".$active;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
+                $this->cache_types_paiements[$obj->id]['id'] =$obj->id;
+                $this->cache_types_paiements[$obj->id]['code'] =$obj->code;
+                $this->cache_types_paiements[$obj->id]['label']=$label;
+                $this->cache_types_paiements[$obj->id]['type'] =$obj->type;
+                $this->cache_types_paiements[$obj->id]['active'] =$obj->active;
+                $i++;
+            }
+
+            $this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
+
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Load into the cache vat rates of a country
-	 *
-	 *	@param	string	$country_code		Country code with quotes ("'CA'", or "'CA,IN,...'")
-	 *	@return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
-	 */
-	function load_cache_vatrates($country_code)
-	{
+    /**
+     *      Return list of payment modes.
+     *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
+     *      See instead to force the default value by the caller.
+     *
+     *      @param	int		$selected		Id of payment term to preselect by default
+     *      @param	string	$htmlname		Nom de la zone select
+     *      @param	int		$filtertype		Not used
+     *		@param	int		$addempty		Add an empty entry
+     * 		@param	int		$noinfoadmin		0=Add admin info, 1=Disable admin info
+     * 		@param	string	$morecss			Add more CSS on select tag
+     *		@return	void
+     */
+    function select_conditions_paiements($selected=0, $htmlname='condid', $filtertype=-1, $addempty=0, $noinfoadmin=0, $morecss='')
+    {
         // phpcs:enable
-		global $langs;
-
-		$num = count($this->cache_vatrates);
-		if ($num > 0) return $num;    // Cache already loaded
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql  = "SELECT DISTINCT t.rowid, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE t.fk_pays = c.rowid";
-		$sql.= " AND t.active > 0";
-		$sql.= " AND c.code IN (".$country_code.")";
-		$sql.= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				for ($i = 0; $i < $num; $i++)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$this->cache_vatrates[$i]['rowid']	= $obj->rowid;
-					$this->cache_vatrates[$i]['code']	= $obj->code;
-					$this->cache_vatrates[$i]['txtva']	= $obj->taux;
-					$this->cache_vatrates[$i]['nprtva']	= $obj->recuperableonly;
-					$this->cache_vatrates[$i]['localtax1']	    = $obj->localtax1;
-					$this->cache_vatrates[$i]['localtax1_type']	= $obj->localtax1_type;
-					$this->cache_vatrates[$i]['localtax2']	    = $obj->localtax2;
-					$this->cache_vatrates[$i]['localtax2_type']	= $obj->localtax1_type;
-
-					$this->cache_vatrates[$i]['label']	= $obj->taux.'%'.($obj->code?' ('.$obj->code.')':'');   // Label must contains only 0-9 , . % or *
-					$this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1?$obj->localtax1:'0').'/'.($obj->localtax2?$obj->localtax2:'0').($obj->code?' ('.$obj->code.')':'');	// Must never be used as key, only label
-					$positiverates='';
-					if ($obj->taux) $positiverates.=($positiverates?'/':'').$obj->taux;
-					if ($obj->localtax1) $positiverates.=($positiverates?'/':'').$obj->localtax1;
-					if ($obj->localtax2) $positiverates.=($positiverates?'/':'').$obj->localtax2;
-					if (empty($positiverates)) $positiverates='0';
-					$this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code?' ('.$obj->code.')':'');	// Must never be used as key, only label
-				}
-
-				return $num;
-			}
-			else
-			{
-				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry",$country_code).'</font>';
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error = '<font class="error">'.$this->db->error().'</font>';
-			return -2;
-		}
-	}
+        global $langs, $user, $conf;
+
+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
+
+        $this->load_cache_conditions_paiements();
+
+        // Set default value if not already set by caller
+        if (empty($selected) && ! empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+
+        print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
+        if ($addempty) print '<option value="0">&nbsp;</option>';
+        foreach($this->cache_conditions_paiements as $id => $arrayconditions)
+        {
+            if ($selected == $id)
+            {
+                print '<option value="'.$id.'" selected>';
+            }
+            else
+            {
+                print '<option value="'.$id.'">';
+            }
+            print $arrayconditions['label'];
+            print '</option>';
+        }
+        print '</select>';
+        if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    }
+
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Output an HTML select vat rate.
-	 *  The name of this function should be selectVat. We keep bad name for compatibility purpose.
-	 *
-	 *  @param	string	      $htmlname           Name of HTML select field
-	 *  @param  float|string  $selectedrate       Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
-	 *  @param  Societe	      $societe_vendeuse   Thirdparty seller
-	 *  @param  Societe	      $societe_acheteuse  Thirdparty buyer
-	 *  @param  int		      $idprod             Id product. O if unknown of NA.
-	 *  @param  int		      $info_bits          Miscellaneous information on line (1 for NPR)
-	 *  @param  int|string    $type               ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)
-	 *                  		                  Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
-	 *                  					      Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
-	 *                  					      Si (vendeur et acheteur dans Communaute europeenne) et bien vendu = moyen de transports neuf (auto, bateau, avion), TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
-	 *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.
-	 *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
-	 *                  					      Sinon la TVA proposee par defaut=0. Fin de regle.
-	 *  @param	bool	     $options_only		  Return HTML options lines only (for ajax treatment)
-	 *  @param  int          $mode                0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
-	 *  @return	string
-	 */
-	function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $mode=0)
-	{
+    /**
+     *      Return list of payment methods
+     *
+     *      @param	string	$selected       Id du mode de paiement pre-selectionne
+     *      @param  string	$htmlname       Nom de la zone select
+     *      @param  string	$filtertype     To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
+     *      @param  int		$format         0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
+     *      @param  int		$empty			1=peut etre vide, 0 sinon
+     * 		@param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+     *      @param  int		$maxlength      Max length of label
+     *      @param  int     $active         Active or not, -1 = all
+     *      @param  string  $morecss        Add more CSS on select tag
+     * 		@return	void
+     */
+    function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=1, $noadmininfo=0, $maxlength=0, $active=1, $morecss='')
+    {
         // phpcs:enable
-		global $langs,$conf,$mysoc;
-
-		$langs->load('errors');
-
-		$return='';
-
-		// Define defaultnpr, defaultttx and defaultcode
-		$defaultnpr=($info_bits & 0x01);
-		$defaultnpr=(preg_match('/\*/',$selectedrate) ? 1 : $defaultnpr);
-		$defaulttx=str_replace('*','',$selectedrate);
-		$defaultcode='';
-		if (preg_match('/\((.*)\)/', $defaulttx, $reg))
-		{
-			$defaultcode=$reg[1];
-			$defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
-		}
-		//var_dump($selectedrate.'-'.$defaulttx.'-'.$defaultnpr.'-'.$defaultcode);
-
-		// Check parameters
-		if (is_object($societe_vendeuse) && ! $societe_vendeuse->country_code)
-		{
-			if ($societe_vendeuse->id == $mysoc->id)
-			{
-				$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
-			}
-			else
-			{
-				$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
-			}
-			return $return;
-		}
-
-		//var_dump($societe_acheteuse);
-		//print "name=$name, selectedrate=$selectedrate, seller=".$societe_vendeuse->country_code." buyer=".$societe_acheteuse->country_code." buyer is company=".$societe_acheteuse->isACompany()." idprod=$idprod, info_bits=$info_bits type=$type";
-		//exit;
-
-		// Define list of countries to use to search VAT rates to show
-		// First we defined code_country to use to find list
-		if (is_object($societe_vendeuse))
-		{
-			$code_country="'".$societe_vendeuse->country_code."'";
-		}
-		else
-		{
-			$code_country="'".$mysoc->country_code."'";   // Pour compatibilite ascendente
-		}
-		if (! empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-			if (! isInEEC($societe_vendeuse) && (! is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && ! $societe_acheteuse->isACompany())))
-			{
-				// We also add the buyer
-				if (is_numeric($type))
-				{
-					if ($type == 1) // We know product is a service
-					{
-						$code_country.=",'".$societe_acheteuse->country_code."'";
-					}
-				}
-				else if (! $idprod)  // We don't know type of product
-				{
-					$code_country.=",'".$societe_acheteuse->country_code."'";
-				}
-				else
-				{
-					$prodstatic=new Product($this->db);
-					$prodstatic->fetch($idprod);
-					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
-					{
-						$code_country.=",'".$societe_acheteuse->country_code."'";
-					}
-				}
-			}
-		}
-
-		// Now we get list
-		$num = $this->load_cache_vatrates($code_country);   // If no vat defined, return -1 with message into this->error
-
-		if ($num > 0)
-		{
-			// Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
-			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
-			{
-				$tmpthirdparty=new Societe($this->db);
-				$defaulttx=get_default_tva($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
-				$defaultnpr=get_default_npr($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
-		        if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
-			        $defaultcode=$reg[1];
-			        $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
-		        }
-				if (empty($defaulttx)) $defaultnpr=0;
-			}
-
-			// Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
-			// Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant
-			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
-			{
-				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) $defaulttx = $this->cache_vatrates[$num-1]['txtva'];
-				else $defaulttx=($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
-			}
-
-			// Disabled if seller is not subject to VAT
-			$disabled=false; $title='';
-			if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0")
-			{
-				// Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses
-				if (empty($conf->global->OVERRIDE_VAT_FOR_EXPENSE_REPORT))
-				{
-					$title=' title="'.$langs->trans('VATIsNotUsed').'"';
-					$disabled=true;
-				}
-			}
-
-			if (! $options_only) $return.= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$title.'>';
-
-			$selectedfound=false;
-			foreach ($this->cache_vatrates as $rate)
-			{
-				// Keep only 0 if seller is not subject to VAT
-				if ($disabled && $rate['txtva'] != 0) continue;
-
-				// Define key to use into select list
-				$key = $rate['txtva'];
-				$key.= $rate['nprtva'] ? '*': '';
-				if ($mode > 0 && $rate['code']) $key.=' ('.$rate['code'].')';
-				if ($mode < 0) $key = $rate['rowid'];
-
-				$return.= '<option value="'.$key.'"';
-				if (! $selectedfound)
-				{
-					if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
-					{
-						if ($defaultcode == $rate['code'])
-						{
-							$return.= ' selected';
-							$selectedfound=true;
-						}
-					}
-					elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
-			   		{
-			   			$return.= ' selected';
-			   			$selectedfound=true;
-					}
-				}
-				$return.= '>';
-				//if (! empty($conf->global->MAIN_VAT_SHOW_POSITIVE_RATES))
-				if ($mysoc->country_code == 'IN' || ! empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
-				{
-					$return.= $rate['labelpositiverates'];
-				}
-				else
-				{
-					$return.= vatrate($rate['label']);
-				}
-				//$return.=($rate['code']?' '.$rate['code']:'');
-				$return.= (empty($rate['code']) && $rate['nprtva']) ? ' *': '';         // We show the *  (old behaviour only if new vat code is not used)
-
-				$return.= '</option>';
-			}
-
-			if (! $options_only) $return.= '</select>';
-		}
-		else
-		{
-			$return.= $this->error;
-		}
-
-		$this->num = $num;
-		return $return;
-	}
+        global $langs,$user;
+
+        dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
+
+        $filterarray=array();
+        if ($filtertype == 'CRDT')  	$filterarray=array(0,2,3);
+        elseif ($filtertype == 'DBIT') 	$filterarray=array(1,2,3);
+        elseif ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype);
+
+        $this->load_cache_types_paiements();
+
+        print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
+        if ($empty) print '<option value="">&nbsp;</option>';
+        foreach($this->cache_types_paiements as $id => $arraytypes)
+        {
+            // If not good status
+            if ($active >= 0 && $arraytypes['active'] != $active) continue;
+
+            // On passe si on a demande de filtrer sur des modes de paiments particuliers
+            if (count($filterarray) && ! in_array($arraytypes['type'],$filterarray)) continue;
+
+            // We discard empty line if showempty is on because an empty line has already been output.
+            if ($empty && empty($arraytypes['code'])) continue;
+
+            if ($format == 0) print '<option value="'.$id.'"';
+            elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+            elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+            elseif ($format == 3) print '<option value="'.$id.'"';
+            // Si selected est text, on compare avec code, sinon avec id
+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
+            elseif ($selected == $id) print ' selected';
+            print '>';
+            if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'],$maxlength):$arraytypes['label']);
+            elseif ($format == 1) $value=$arraytypes['code'];
+            elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'],$maxlength):$arraytypes['label']);
+            elseif ($format == 3) $value=$arraytypes['code'];
+            print $value?$value:'&nbsp;';
+            print '</option>';
+        }
+        print '</select>';
+        if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    }
+
+
+    /**
+     *  Selection HT or TTC
+     *
+     *  @param	string	$selected       Id pre-selectionne
+     *  @param  string	$htmlname       Nom de la zone select
+     * 	@return	string					Code of HTML select to chose tax or not
+     */
+    function selectPriceBaseType($selected='',$htmlname='price_base_type')
+    {
+        global $langs;
+
+        $return='';
+
+        $return.= '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+        $options = array(
+            'HT'=>$langs->trans("HT"),
+            'TTC'=>$langs->trans("TTC")
+        );
+        foreach($options as $id => $value)
+        {
+            if ($selected == $id)
+            {
+                $return.= '<option value="'.$id.'" selected>'.$value;
+            }
+            else
+            {
+                $return.= '<option value="'.$id.'">'.$value;
+            }
+            $return.= '</option>';
+        }
+        $return.= '</select>';
+
+        return $return;
+    }
+
+    /**
+     *  Return a HTML select list of shipping mode
+     *
+     *  @param	string	$selected          Id shipping mode pre-selected
+     *  @param  string	$htmlname          Name of select zone
+     *  @param  string	$filtre            To filter list
+     *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *  @param  string	$moreattrib        To add more attribute on select
+     * 	@return	void
+     */
+    function selectShippingMethod($selected='',$htmlname='shipping_method_id',$filtre='',$useempty=0,$moreattrib='')
+    {
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+        $langs->load("deliveries");
+
+        $sql = "SELECT rowid, code, libelle as label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
+        $sql.= " WHERE active > 0";
+        if ($filtre) $sql.=" AND ".$filtre;
+        $sql.= " ORDER BY libelle ASC";
+
+        dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            if ($num) {
+                print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
+                    print '<option value="-1">&nbsp;</option>';
+                }
+                while ($i < $num) {
+                    $obj = $this->db->fetch_object($result);
+                    if ($selected == $obj->rowid) {
+                        print '<option value="'.$obj->rowid.'" selected>';
+                    } else {
+                        print '<option value="'.$obj->rowid.'">';
+                    }
+                    print ($langs->trans("SendingMethod".strtoupper($obj->code)) != "SendingMethod".strtoupper($obj->code)) ? $langs->trans("SendingMethod".strtoupper($obj->code)) : $obj->label;
+                    print '</option>';
+                    $i++;
+                }
+                print "</select>";
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            } else {
+                print $langs->trans("NoShippingMethodDefined");
+            }
+        } else {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *    Display form to select shipping mode
+     *
+     *    @param	string	$page        Page
+     *    @param    int		$selected    Id of shipping mode
+     *    @param    string	$htmlname    Name of select html field
+     *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *    @return	void
+     */
+    function formSelectShippingMethod($page, $selected='', $htmlname='shipping_method_id', $addempty=0)
+    {
+        global $langs, $db;
+
+        $langs->load("deliveries");
+
+        if ($htmlname != "none") {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setshippingmethod">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $this->selectShippingMethod($selected, $htmlname, '', $addempty);
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        } else {
+            if ($selected) {
+                $code=$langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');
+                print $langs->trans("SendingMethod".strtoupper($code));
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    /**
+     * Creates HTML last in cycle situation invoices selector
+     *
+     * @param     string  $selected   		Preselected ID
+     * @param     int     $socid      		Company ID
+     *
+     * @return    string                     HTML select
+     */
+    function selectSituationInvoices($selected = '', $socid = 0)
+    {
+        global $langs;
+
+        $langs->load('bills');
+
+        $opt = '<option value ="" selected></option>';
+        $sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_counter>=1';
+        $sql.= ' ORDER by situation_cycle_ref, situation_counter desc';
+        $resql = $this->db->query($sql);
+        if ($resql && $this->db->num_rows($resql) > 0) {
+            // Last seen cycle
+            $ref = 0;
+            while ($obj = $this->db->fetch_object($resql)){
+                //Same company ?
+                if ($socid == $obj->fk_soc) {
+                    //Same cycle ?
+                    if ($obj->situation_cycle_ref != $ref) {
+                        // Just seen this cycle
+                        $ref = $obj->situation_cycle_ref;
+                        //not final ?
+                        if ($obj->situation_final != 1) {
+                            //Not prov?
+                            if (substr($obj->ref, 1, 4) != 'PROV') {
+                                if ($selected == $obj->rowid) {
+                                    $opt .= '<option value="' . $obj->rowid . '" selected>' . $obj->ref . '</option>';
+                                } else {
+                                    $opt .= '<option value="' . $obj->rowid . '">' . $obj->ref . '</option>';
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+                dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+        }
+        if ($opt == '<option value ="" selected></option>')
+        {
+            $opt = '<option value ="0" selected>' . $langs->trans('NoSituations') . '</option>';
+        }
+        return $opt;
+    }
+
+    /**
+     *      Creates HTML units selector (code => label)
+     *
+     *      @param	string	$selected       Preselected Unit ID
+     *      @param  string	$htmlname       Select name
+     *      @param	int		$showempty		Add a nempty line
+     * 		@return	string                  HTML select
+     */
+    function selectUnits($selected = '', $htmlname = 'units', $showempty=0)
+    {
+        global $langs;
+
+        $langs->load('products');
+
+        $return= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+
+        $sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
+        $sql.= ' WHERE active > 0';
+
+        $resql = $this->db->query($sql);
+        if($resql && $this->db->num_rows($resql) > 0)
+        {
+            if ($showempty) $return .= '<option value="none"></option>';
+
+            while($res = $this->db->fetch_object($resql))
+            {
+                $unitLabel = $res->label;
+                if (! empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
+                {
+                    $unitLabel = $langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label;
+                }
+
+                if ($selected == $res->rowid)
+                {
+                    $return.='<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
+                }
+                else
+                {
+                    $return.='<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
+                }
+            }
+            $return.='</select>';
+        }
+        return $return;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Return a HTML select list of bank accounts
+     *
+     *  @param	string	$selected           Id account pre-selected
+     *  @param  string	$htmlname           Name of select zone
+     *  @param  int		$statut             Status of searched accounts (0=open, 1=closed, 2=both)
+     *  @param  string	$filtre             To filter list
+     *  @param  int		$useempty           1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *  @param  string	$moreattrib         To add more attribute on select
+     *  @param	int		$showcurrency		Show currency in label
+     * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)
+     */
+    function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0,$moreattrib='',$showcurrency=0)
+    {
+        // phpcs:enable
+        global $langs, $conf;
+
+        $langs->load("admin");
+        $num = 0;
+
+        $sql = "SELECT rowid, label, bank, clos as status, currency_code";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+        $sql.= " WHERE entity IN (".getEntity('bank_account').")";
+        if ($statut != 2) $sql.= " AND clos = '".$statut."'";
+        if ($filtre) $sql.=" AND ".$filtre;
+        $sql.= " ORDER BY label";
+
+        dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            if ($num)
+            {
+                print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                if ($useempty == 1 || ($useempty == 2 && $num > 1))
+                {
+                    print '<option value="-1">&nbsp;</option>';
+                }
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($result);
+                    if ($selected == $obj->rowid)
+                    {
+                        print '<option value="'.$obj->rowid.'" selected>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$obj->rowid.'">';
+                    }
+                    print trim($obj->label);
+                    if ($showcurrency) print ' ('.$obj->currency_code.')';
+                    if ($statut == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+                    print '</option>';
+                    $i++;
+                }
+                print "</select>";
+            }
+            else
+            {
+                if ($statut == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+                else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
+
+        return $num;
+    }
+
+    /**
+     *    Display form to select bank account
+     *
+     *    @param	string	$page        Page
+     *    @param    int		$selected    Id of bank account
+     *    @param    string	$htmlname    Name of select html field
+     *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *    @return	void
+     */
+    function formSelectAccount($page, $selected='', $htmlname='fk_account', $addempty=0)
+    {
+        global $langs;
+        if ($htmlname != "none") {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setbankaccount">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);
+            if ($nbaccountfound > 0) print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        } else {
+
+            $langs->load('banks');
+
+            if ($selected) {
+                require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
+                $bankstatic=new Account($this->db);
+                $result = $bankstatic->fetch($selected);
+                if ($result) print $bankstatic->getNomUrl(1);
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Return list of categories having choosed type
+     *
+     *    @param	string|int	$type				Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+     *    @param    string		$selected    		Id of category preselected or 'auto' (autoselect category if there is only one element)
+     *    @param    string		$htmlname			HTML field name
+     *    @param    int			$maxlength      	Maximum length for labels
+     *    @param    int			$excludeafterid 	Exclude all categories after this leaf in category tree.
+     *    @param	int			$outputmode			0=HTML select string, 1=Array
+     *    @return	string
+     *    @see select_categories
+     */
+    function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0, $outputmode=0)
+    {
+        // phpcs:enable
+        global $conf, $langs;
+        $langs->load("categories");
+
+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+        // For backward compatibility
+        if (is_numeric($type))
+        {
+            dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
+        }
+
+        if ($type === Categorie::TYPE_BANK_LINE)
+        {
+            // TODO Move this into common category feature
+            $categids=array();
+            $sql = "SELECT c.label, c.rowid";
+            $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
+            $sql.= " WHERE entity = ".$conf->entity;
+            $sql.= " ORDER BY c.label";
+            $result = $this->db->query($sql);
+            if ($result)
+            {
+                $num = $this->db->num_rows($result);
+                $i = 0;
+                while ($i < $num)
+                {
+                    $objp = $this->db->fetch_object($result);
+                    if ($objp) $cate_arbo[$objp->rowid]=array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+                    $i++;
+                }
+                $this->db->free($result);
+            }
+            else dol_print_error($this->db);
+        }
+        else
+        {
+            $cat = new Categorie($this->db);
+            $cate_arbo = $cat->get_full_arbo($type, $excludeafterid);
+        }
+
+        $output = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+        $outarray=array();
+        if (is_array($cate_arbo))
+        {
+            if (! count($cate_arbo)) $output.= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+            else
+            {
+                $output.= '<option value="-1">&nbsp;</option>';
+                foreach($cate_arbo as $key => $value)
+                {
+                    if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
+                    {
+                        $add = 'selected ';
+                    }
+                    else
+                    {
+                        $add = '';
+                    }
+                    $output.= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'],$maxlength,'middle').'</option>';
+
+                    $outarray[$cate_arbo[$key]['id']] = $cate_arbo[$key]['fulllabel'];
+                }
+            }
+        }
+        $output.= '</select>';
+        $output.= "\n";
+
+        if ($outputmode) return $outarray;
+        return $output;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *     Show a confirmation HTML form or AJAX popup
+     *
+     *     @param	string		$page        	   	Url of page to call if confirmation is OK
+     *     @param	string		$title       	   	Title
+     *     @param	string		$question    	   	Question
+     *     @param 	string		$action      	   	Action
+     *	   @param	array		$formquestion	   	An array with forms complementary inputs
+     * 	   @param	string		$selectedchoice		"" or "no" or "yes"
+     * 	   @param	int			$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=preoutput confirm box with div id=dialog-confirm-xxx
+     *     @param	int			$height          	Force height of box
+     *     @param	int			$width				Force width of box
+     *     @return 	void
+     *     @deprecated
+     *     @see formconfirm()
+     */
+    function form_confirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=170, $width=500)
+    {
+        // phpcs:enable
+        dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
+        print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);
+    }
+
+    /**
+     *     Show a confirmation HTML form or AJAX popup.
+     *     Easiest way to use this is with useajax=1.
+     *     If you use useajax='xxx', you must also add jquery code to trigger opening of box (with correct parameters)
+     *     just after calling this method. For example:
+     *       print '<script type="text/javascript">'."\n";
+     *       print 'jQuery(document).ready(function() {'."\n";
+     *       print 'jQuery(".xxxlink").click(function(e) { jQuery("#aparamid").val(jQuery(this).attr("rel")); jQuery("#dialog-confirm-xxx").dialog("open"); return false; });'."\n";
+     *       print '});'."\n";
+     *       print '</script>'."\n";
+     *
+     *     @param  	string		$page        	   	Url of page to call if confirmation is OK. Can contains paramaters (param 'action' and 'confirm' will be reformated)
+     *     @param	string		$title       	   	Title
+     *     @param	string		$question    	   	Question
+     *     @param 	string		$action      	   	Action
+     *	   @param  	array		$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
+     *												type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
+     * 	   @param  	string		$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
+     * 	   @param  	int			$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
+     *     @param  	int			$height          	Force height of box
+     *     @param	int			$width				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
+     *     @param	int			$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.
+     *     @return 	string      	    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
+     */
+    function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice='', $useajax=0, $height=210, $width=500, $disableformtag=0)
+    {
+        global $langs,$conf;
+        global $useglobalvars;
+
+        $more='';
+        $formconfirm='';
+        $inputok=array();
+        $inputko=array();
+
+        // Clean parameters
+        $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
+        if ($conf->browser->layout == 'phone') $width='95%';
+
+        if (is_array($formquestion) && ! empty($formquestion))
+        {
+            // First add hidden fields and value
+            foreach ($formquestion as $key => $input)
+            {
+                if (is_array($input) && ! empty($input))
+                {
+                    if ($input['type'] == 'hidden')
+                    {
+                        $more.='<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.dol_escape_htmltag($input['value']).'">'."\n";
+                    }
+                }
+            }
+
+            // Now add questions
+            $more.='<table class="paddingtopbottomonly" width="100%">'."\n";
+            if (! empty($formquestion['text'])) $more.='<tr><td colspan="2">'.$formquestion['text'].'</td></tr>'."\n";
+            foreach ($formquestion as $key => $input)
+            {
+                if (is_array($input) && ! empty($input))
+                {
+                    $size=(! empty($input['size'])?' size="'.$input['size'].'"':'');
+                    $moreattr=(! empty($input['moreattr'])?' '.$input['moreattr']:'');
+                    $morecss=(! empty($input['morecss'])?' '.$input['morecss']:'');
+
+                    if ($input['type'] == 'text')
+                    {
+                        $more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";
+                    }
+                    elseif ($input['type'] == 'password')
+                    {
+                        $more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";
+                    }
+                    elseif ($input['type'] == 'select')
+                    {
+                        $more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>';
+                        if (! empty($input['label'])) $more.=$input['label'].'</td><td class="tdtop" align="left">';
+                        $more.=$this->selectarray($input['name'],$input['values'],$input['default'],1,0,0,$moreattr,0,0,0,'',$morecss);
+                        $more.='</td></tr>'."\n";
+                    }
+                    elseif ($input['type'] == 'checkbox')
+                    {
+                        $more.='<tr>';
+                        $more.='<td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].' </td><td align="left">';
+                        $more.='<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;
+                        if (! is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') $more.=' checked';
+                        if (is_bool($input['value']) && $input['value']) $more.=' checked';
+                        if (isset($input['disabled'])) $more.=' disabled';
+                        $more.=' /></td>';
+                        $more.='</tr>'."\n";
+                    }
+                    elseif ($input['type'] == 'radio')
+                    {
+                        $i=0;
+                        foreach($input['values'] as $selkey => $selval)
+                        {
+                            $more.='<tr>';
+                            if ($i==0) $more.='<td'.(empty($input['tdclass'])?' class="tdtop"':(' class="tdtop '.$input['tdclass'].'"')).'>'.$input['label'].'</td>';
+                            else $more.='<td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>&nbsp;</td>';
+                            $more.='<td><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
+                            if ($input['disabled']) $more.=' disabled';
+                            $more.=' /> ';
+                            $more.=$selval;
+                            $more.='</td></tr>'."\n";
+                            $i++;
+                        }
+                    }
+                    elseif ($input['type'] == 'date')
+                    {
+                        $more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td>';
+                        $more.='<td align="left">';
+                        $more.=$this->selectDate($input['value'],$input['name'],0,0,0,'',1,0);
+                        $more.='</td></tr>'."\n";
+                        $formquestion[] = array('name'=>$input['name'].'day');
+                        $formquestion[] = array('name'=>$input['name'].'month');
+                        $formquestion[] = array('name'=>$input['name'].'year');
+                        $formquestion[] = array('name'=>$input['name'].'hour');
+                        $formquestion[] = array('name'=>$input['name'].'min');
+                    }
+                    elseif ($input['type'] == 'other')
+                    {
+                        $more.='<tr><td'.(empty($input['tdclass'])?'':(' class="'.$input['tdclass'].'"')).'>';
+                        if (! empty($input['label'])) $more.=$input['label'].'</td><td align="left">';
+                        $more.=$input['value'];
+                        $more.='</td></tr>'."\n";
+                    }
+
+                    elseif ($input['type'] == 'onecolumn')
+                    {
+                        $more.='<tr><td colspan="2" align="left">';
+                        $more.=$input['value'];
+                        $more.='</td></tr>'."\n";
+                    }
+                }
+            }
+            $more.='</table>'."\n";
+        }
+
+        // JQUI method dialog is broken with jmobile, we use standard HTML.
+        // Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
+        // See page product/card.php for example
+        if (! empty($conf->dol_use_jmobile)) $useajax=0;
+        if (empty($conf->use_javascript_ajax)) $useajax=0;
+
+        if ($useajax)
+        {
+            $autoOpen=true;
+            $dialogconfirm='dialog-confirm';
+            $button='';
+            if (! is_numeric($useajax))
+            {
+                $button=$useajax;
+                $useajax=1;
+                $autoOpen=false;
+                $dialogconfirm.='-'.$button;
+            }
+            $pageyes=$page.(preg_match('/\?/',$page)?'&':'?').'action='.$action.'&confirm=yes';
+            $pageno=($useajax == 2 ? $page.(preg_match('/\?/',$page)?'&':'?').'confirm=no':'');
+            // Add input fields into list of fields to read during submit (inputok and inputko)
+            if (is_array($formquestion))
+            {
+                foreach ($formquestion as $key => $input)
+                {
+                    //print "xx ".$key." rr ".is_array($input)."<br>\n";
+                    if (is_array($input) && isset($input['name'])) array_push($inputok,$input['name']);
+                    if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko,$input['name']);
+                }
+            }
+            // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
+            $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
+            if (! empty($more)) {
+                $formconfirm.= '<div class="confirmquestions">'.$more.'</div>';
+            }
+            $formconfirm.= ($question ? '<div class="confirmmessage">'.img_help('','').' '.$question . '</div>': '');
+            $formconfirm.= '</div>'."\n";
+
+            $formconfirm.= "\n<!-- begin ajax formconfirm page=".$page." -->\n";
+            $formconfirm.= '<script type="text/javascript">'."\n";
+            $formconfirm.= 'jQuery(document).ready(function() {
+            $(function() {
+            	$( "#'.$dialogconfirm.'" ).dialog(
+            	{
+                    autoOpen: '.($autoOpen ? "true" : "false").',';
+            if ($newselectedchoice == 'no')
+            {
+                $formconfirm.='
+						open: function() {
+            				$(this).parent().find("button.ui-button:eq(2)").focus();
+						},';
+            }
+            $formconfirm.='
+                    resizable: false,
+                    height: "'.$height.'",
+                    width: "'.$width.'",
+                    modal: true,
+                    closeOnEscape: false,
+                    buttons: {
+                        "'.dol_escape_js($langs->transnoentities("Yes")).'": function() {
+                        	var options="";
+                        	var inputok = '.json_encode($inputok).';
+                         	var pageyes = "'.dol_escape_js(! empty($pageyes)?$pageyes:'').'";
+                         	if (inputok.length>0) {
+                         		$.each(inputok, function(i, inputname) {
+                         			var more = "";
+                         			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
+                         		    if ($("#" + inputname).attr("type") == "radio") { more = ":checked"; }
+                         			var inputvalue = $("#" + inputname + more).val();
+                         			if (typeof inputvalue == "undefined") { inputvalue=""; }
+                         			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
+                         		});
+                         	}
+                         	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options;
+                         	//alert(urljump);
+            				if (pageyes.length > 0) { location.href = urljump; }
+                            $(this).dialog("close");
+                        },
+                        "'.dol_escape_js($langs->transnoentities("No")).'": function() {
+                        	var options = "";
+                         	var inputko = '.json_encode($inputko).';
+                         	var pageno="'.dol_escape_js(! empty($pageno)?$pageno:'').'";
+                         	if (inputko.length>0) {
+                         		$.each(inputko, function(i, inputname) {
+                         			var more = "";
+                         			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
+                         			var inputvalue = $("#" + inputname + more).val();
+                         			if (typeof inputvalue == "undefined") { inputvalue=""; }
+                         			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
+                         		});
+                         	}
+                         	var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options;
+                         	//alert(urljump);
+            				if (pageno.length > 0) { location.href = urljump; }
+                            $(this).dialog("close");
+                        }
+                    }
+                }
+                );
+
+            	var button = "'.$button.'";
+            	if (button.length > 0) {
+                	$( "#" + button ).click(function() {
+                		$("#'.$dialogconfirm.'").dialog("open");
+        			});
+                }
+            });
+            });
+            </script>';
+            $formconfirm.= "<!-- end ajax formconfirm -->\n";
+        }
+        else
+        {
+            $formconfirm.= "\n<!-- begin formconfirm page=".$page." -->\n";
+
+            if (empty($disableformtag)) $formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+
+            $formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
+            if (empty($disableformtag)) $formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+
+            $formconfirm.= '<table width="100%" class="valid">'."\n";
+
+            // Line title
+            $formconfirm.= '<tr class="validtitre"><td class="validtitre" colspan="3">'.img_picto('','recent').' '.$title.'</td></tr>'."\n";
+
+            // Line form fields
+            if ($more)
+            {
+                $formconfirm.='<tr class="valid"><td class="valid" colspan="3">'."\n";
+                $formconfirm.=$more;
+                $formconfirm.='</td></tr>'."\n";
+            }
+
+            // Line with question
+            $formconfirm.= '<tr class="valid">';
+            $formconfirm.= '<td class="valid">'.$question.'</td>';
+            $formconfirm.= '<td class="valid">';
+            $formconfirm.= $this->selectyesno("confirm",$newselectedchoice);
+            $formconfirm.= '</td>';
+            $formconfirm.= '<td class="valid" align="center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';
+            $formconfirm.= '</tr>'."\n";
+
+            $formconfirm.= '</table>'."\n";
+
+            if (empty($disableformtag)) $formconfirm.= "</form>\n";
+            $formconfirm.= '<br>';
+
+            $formconfirm.= "<!-- end formconfirm -->\n";
+        }
+
+        return $formconfirm;
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Show a form to select a project
+     *
+     *    @param	int		$page        		Page
+     *    @param	int		$socid       		Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+     *    @param    int		$selected    		Id pre-selected project
+     *    @param    string	$htmlname    		Name of select field
+     *    @param	int		$discard_closed		Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
+     *    @param	int		$maxlength			Max length
+     *    @param	int		$forcefocus			Force focus on field (works with javascript only)
+     *    @param    int     $nooutput           No print is done. String is returned.
+     *    @return	string                      Return html content
+     */
+    function form_project($page, $socid, $selected='', $htmlname='projectid', $discard_closed=0, $maxlength=20, $forcefocus=0, $nooutput=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+
+        $out='';
+
+        $formproject=new FormProjets($this->db);
+
+        $langs->load("project");
+        if ($htmlname != "none")
+        {
+            $out.="\n";
+            $out.='<form method="post" action="'.$page.'">';
+            $out.='<input type="hidden" name="action" value="classin">';
+            $out.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $out.=$formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
+            $out.='<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+            $out.='</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                $projet = new Project($this->db);
+                $projet->fetch($selected);
+                //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
+                $out.=$projet->getNomUrl(0,'',1);
+            }
+            else
+            {
+                $out.="&nbsp;";
+            }
+        }
+
+        if (empty($nooutput))
+        {
+            print $out;
+            return '';
+        }
+        return $out;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Show a form to select payment conditions
+     *
+     *  @param	int		$page        	Page
+     *  @param  string	$selected    	Id condition pre-selectionne
+     *  @param  string	$htmlname    	Name of select html field
+     *	@param	int		$addempty		Add empty entry
+     *  @return	void
+     */
+    function form_conditions_reglement($page, $selected='', $htmlname='cond_reglement_id', $addempty=0)
+    {
+        // phpcs:enable
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="post" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setconditions">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $this->select_conditions_paiements($selected,$htmlname,-1,$addempty);
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                $this->load_cache_conditions_paiements();
+                print $this->cache_conditions_paiements[$selected]['label'];
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Show a form to select a delivery delay
+     *
+     *  @param  int		$page        	Page
+     *  @param  string	$selected    	Id condition pre-selectionne
+     *  @param  string	$htmlname    	Name of select html field
+     *	@param	int		$addempty		Ajoute entree vide
+     *  @return	void
+     */
+    function form_availability($page, $selected='', $htmlname='availability', $addempty=0)
+    {
+        // phpcs:enable
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="post" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setavailability">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $this->selectAvailabilityDelay($selected,$htmlname,-1,$addempty);
+            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                $this->load_cache_availability();
+                print $this->cache_availability[$selected]['label'];
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    /**
+     *	Output HTML form to select list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
+     *  List found into table c_input_reason loaded by loadCacheInputReason
+     *
+     *  @param  string	$page        	Page
+     *  @param  string	$selected    	Id condition pre-selectionne
+     *  @param  string	$htmlname    	Name of select html field
+     *	@param	int		$addempty		Add empty entry
+     *  @return	void
+     */
+    function formInputReason($page, $selected='', $htmlname='demandreason', $addempty=0)
+    {
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="post" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setdemandreason">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $this->selectInputReason($selected,$htmlname,-1,$addempty);
+            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                $this->loadCacheInputReason();
+                foreach ($this->cache_demand_reason as $key => $val)
+                {
+                    if ($val['id'] == $selected)
+                    {
+                        print $val['label'];
+                        break;
+                    }
+                }
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Show a form + html select a date
+     *
+     *    @param	string		$page        	Page
+     *    @param	string		$selected    	Date preselected
+     *    @param    string		$htmlname    	Html name of date input fields or 'none'
+     *    @param    int			$displayhour 	Display hour selector
+     *    @param    int			$displaymin		Display minutes selector
+     *    @param	int			$nooutput		1=No print output, return string
+     *    @return	string
+     *    @see		selectDate
+     */
+    function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $nooutput=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        $ret='';
+
+        if ($htmlname != "none")
+        {
+            $ret.='<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
+            $ret.='<input type="hidden" name="action" value="set'.$htmlname.'">';
+            $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $ret.='<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            $ret.='<tr><td>';
+            $ret.=$this->selectDate($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0);
+            $ret.='</td>';
+            $ret.='<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            $ret.='</tr></table></form>';
+        }
+        else
+        {
+            if ($displayhour) $ret.=dol_print_date($selected,'dayhour');
+            else $ret.=dol_print_date($selected,'day');
+        }
+
+        if (empty($nooutput)) print $ret;
+        return $ret;
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Show a select form to choose a user
+     *
+     *  @param	string	$page        	Page
+     *  @param  string	$selected    	Id of user preselected
+     *  @param  string	$htmlname    	Name of input html field. If 'none', we just output the user link.
+     *  @param  array	$exclude		List of users id to exclude
+     *  @param  array	$include        List of users id to include
+     *  @return	void
+     */
+    function form_users($page, $selected='', $htmlname='userid', $exclude='', $include='')
+    {
+        // phpcs:enable
+        global $langs;
+
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';
+            print '<input type="hidden" name="action" value="set'.$htmlname.'">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print $this->select_dolusers($selected,$htmlname,1,$exclude,0,$include);
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+                $theuser=new User($this->db);
+                $theuser->fetch($selected);
+                print $theuser->getNomUrl(1);
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Show form with payment mode
+     *
+     *    @param	string	$page        	Page
+     *    @param    int		$selected    	Id mode pre-selectionne
+     *    @param    string	$htmlname    	Name of select html field
+     *    @param  	string	$filtertype		To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))
+     *    @param    int     $active         Active or not, -1 = all
+     *    @return	void
+     */
+    function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id', $filtertype='', $active=1)
+    {
+        // phpcs:enable
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setmode">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $this->select_types_paiements($selected,$htmlname,$filtertype,0,0,0,0,$active);
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                $this->load_cache_types_paiements();
+                print $this->cache_types_paiements[$selected]['label'];
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Show form with multicurrency code
+     *
+     *    @param	string	$page        	Page
+     *    @param    string	$selected    	code pre-selectionne
+     *    @param    string	$htmlname    	Name of select html field
+     *    @return	void
+     */
+    function form_multicurrency_code($page, $selected='', $htmlname='multicurrency_code')
+    {
+        // phpcs:enable
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setmulticurrencycode">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print $this->selectMultiCurrency($selected, $htmlname, 0);
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            dol_include_once('/core/lib/company.lib.php');
+            print !empty($selected) ? currency_name($selected,1) : '&nbsp;';
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Show form with multicurrency rate
+     *
+     *    @param	string	$page        	Page
+     *    @param    double	$rate	    	Current rate
+     *    @param    string	$htmlname    	Name of select html field
+     *    @param    string  $currency       Currency code to explain the rate
+     *    @return	void
+     */
+    function form_multicurrency_rate($page, $rate='', $htmlname='multicurrency_tx', $currency='')
+    {
+        // phpcs:enable
+        global $langs, $mysoc, $conf;
+
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setmulticurrencyrate">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? price($rate) : 1).'" size="10" /> ';
+            print '<select name="calculation_mode">';
+            print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';
+            print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';
+            print '</select> ';
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else
+        {
+            if (! empty($rate))
+            {
+                print price($rate, 1, $langs, 1, 0);
+                if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
+            }
+            else
+            {
+                print 1;
+            }
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Show a select box with available absolute discounts
+     *
+     *  @param  string	$page        	Page URL where form is shown
+     *  @param  int		$selected    	Value pre-selected
+     *	@param  string	$htmlname    	Name of SELECT component. If 'none', not changeable. Example 'remise_id'.
+     *	@param	int		$socid			Third party id
+     * 	@param	float	$amount			Total amount available
+     * 	@param	string	$filter			SQL filter on discounts
+     * 	@param	int		$maxvalue		Max value for lines that can be selected
+     *  @param  string	$more           More string to add
+     *  @param  int     $hidelist       1=Hide list
+     *  @param	int		$discount_type	0 => customer discount, 1 => supplier discount
+     *  @return	void
+     */
+    function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0, $discount_type=0)
+    {
+        // phpcs:enable
+        global $conf,$langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="post" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setabsolutediscount">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<div class="inline-block">';
+            if(! empty($discount_type)) {
+                if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+                {
+                    if (! $filter || $filter=="fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice
+                    else $translationKey = 'HasCreditNoteFromSupplier';
+                }
+                else
+                {
+                    if (! $filter || $filter=="fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    else $translationKey = 'HasCreditNoteFromSupplier';
+                }
+            } else {
+                if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+                {
+                    if (! $filter || $filter=="fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice
+                    else $translationKey = 'CompanyHasCreditNote';
+                }
+                else
+                {
+                    if (! $filter || $filter=="fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
+                    else $translationKey = 'CompanyHasCreditNote';
+                }
+            }
+            print $langs->trans($translationKey,price($amount,0,$langs,0,0,-1,$conf->currency));
+            if (empty($hidelist)) print ': ';
+            print '</div>';
+            if (empty($hidelist))
+            {
+                print '<div class="inline-block" style="padding-right: 10px">';
+                $newfilter = 'discount_type='.intval($discount_type);
+                if(! empty($discount_type)) {
+                    $newfilter.= ' AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Supplier discounts available
+                } else {
+                    $newfilter.= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available
+                }
+                if ($filter) $newfilter.=' AND ('.$filter.')';
+                $nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue);
+                if ($nbqualifiedlines > 0)
+                {
+                    print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
+                    if(! empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
+                        print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+                    if(empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
+                        print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+
+                    print '>';
+                }
+                print '</div>';
+            }
+            if ($more)
+            {
+                print '<div class="inline-block">';
+                print $more;
+                print '</div>';
+            }
+            print '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                print $selected;
+            }
+            else
+            {
+                print "0";
+            }
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Show forms to select a contact
+     *
+     *    @param	string		$page        	Page
+     *    @param	Societe		$societe		Filter on third party
+     *    @param    int			$selected    	Id contact pre-selectionne
+     *    @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.
+     *    @return	void
+     */
+    function form_contacts($page, $societe, $selected='', $htmlname='contactid')
+    {
+        // phpcs:enable
+        global $langs, $conf;
+
+        if ($htmlname != "none")
+        {
+            print '<form method="post" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="set_contact">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            $num=$this->select_contacts($societe->id, $selected, $htmlname);
+            if ($num==0)
+            {
+                $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
+                print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';
+            }
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
+                $contact=new Contact($this->db);
+                $contact->fetch($selected);
+                print $contact->getFullName($langs);
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Output html select to select thirdparty
+     *
+     *  @param	string	$page       	Page
+     *  @param  string	$selected   	Id preselected
+     *  @param  string	$htmlname		Name of HTML select
+     *  @param  string	$filter         optional filters criteras
+     *	@param	int		$showempty		Add an empty field
+     * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
+     * 	@param	int		$forcecombo		Force to use combo box
+     *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @param  int     $nooutput       No print output. Return it only.
+     *  @return	void
+     */
+    function form_thirdparty($page, $selected='', $htmlname='socid', $filter='',$showempty=0, $showtype=0, $forcecombo=0, $events=array(), $nooutput=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        $out = '';
+        if ($htmlname != "none")
+        {
+            $out.='<form method="post" action="'.$page.'">';
+            $out.= '<input type="hidden" name="action" value="set_thirdparty">';
+            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $out.= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
+            $out.= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            $out.= '</form>';
+        }
+        else
+        {
+            if ($selected)
+            {
+                require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+                $soc = new Societe($this->db);
+                $soc->fetch($selected);
+                $out.= $soc->getNomUrl($langs);
+            }
+            else
+            {
+                $out.= "&nbsp;";
+            }
+        }
+
+        if ($nooutput) return $out;
+        else print $out;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *    Retourne la liste des devises, dans la langue de l'utilisateur
+     *
+     *    @param	string	$selected    preselected currency code
+     *    @param    string	$htmlname    name of HTML select list
+     *    @deprecated
+     *    @return	void
+     */
+    function select_currency($selected='',$htmlname='currency_id')
+    {
+        // phpcs:enable
+        print $this->selectCurrency($selected,$htmlname);
+    }
+
+    /**
+     *  Retourne la liste des devises, dans la langue de l'utilisateur
+     *
+     *  @param	string	$selected    preselected currency code
+     *  @param  string	$htmlname    name of HTML select list
+     * 	@return	string
+     */
+    function selectCurrency($selected='',$htmlname='currency_id')
+    {
+        global $conf,$langs,$user;
+
+        $langs->loadCacheCurrencies('');
+
+        $out='';
+
+        if ($selected=='euro' || $selected=='euros') $selected='EUR';   // Pour compatibilite
+
+        $out.= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
+        foreach ($langs->cache_currencies as $code_iso => $currency)
+        {
+            if ($selected && $selected == $code_iso)
+            {
+                $out.= '<option value="'.$code_iso.'" selected>';
+            }
+            else
+            {
+                $out.= '<option value="'.$code_iso.'">';
+            }
+            $out.= $currency['label'];
+            $out.= ' ('.$langs->getCurrencySymbol($code_iso).')';
+            $out.= '</option>';
+        }
+        $out.= '</select>';
+        if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+
+        // Make select dynamic
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        $out .= ajax_combobox($htmlname);
+
+        return $out;
+    }
+
+    /**
+     *	Return array of currencies in user language
+     *
+     *  @param	string	$selected    preselected currency code
+     *  @param  string	$htmlname    name of HTML select list
+     *  @param  integer	$useempty    1=Add empty line
+     * 	@return	string
+     */
+    function selectMultiCurrency($selected='', $htmlname='multicurrency_code', $useempty=0)
+    {
+        global $db,$conf,$langs,$user;
+
+        $langs->loadCacheCurrencies('');        // Load ->cache_currencies
+
+        $TCurrency = array();
+
+        $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
+        $sql.= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            while ($obj = $db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
+        }
+
+        $out='';
+        $out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+        if ($useempty) $out .= '<option value=""></option>';
+        // If company current currency not in table, we add it into list. Should always be available.
+        if (! in_array($conf->currency, $TCurrency))
+        {
+            $TCurrency[$conf->currency] = $conf->currency;
+        }
+        if (count($TCurrency) > 0)
+        {
+            foreach ($langs->cache_currencies as $code_iso => $currency)
+            {
+                if (isset($TCurrency[$code_iso]))
+                {
+                    if (!empty($selected) && $selected == $code_iso) $out.= '<option value="'.$code_iso.'" selected="selected">';
+                    else $out.= '<option value="'.$code_iso.'">';
+
+                    $out.= $currency['label'];
+                    $out.= ' ('.$langs->getCurrencySymbol($code_iso).')';
+                    $out.= '</option>';
+                }
+            }
+        }
+
+        $out.= '</select>';
+        // Make select dynamic
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        $out.= ajax_combobox($htmlname);
+
+        return $out;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Load into the cache vat rates of a country
+     *
+     *	@param	string	$country_code		Country code with quotes ("'CA'", or "'CA,IN,...'")
+     *	@return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
+     */
+    function load_cache_vatrates($country_code)
+    {
+        // phpcs:enable
+        global $langs;
+
+        $num = count($this->cache_vatrates);
+        if ($num > 0) return $num;    // Cache already loaded
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql  = "SELECT DISTINCT t.rowid, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql.= " WHERE t.fk_pays = c.rowid";
+        $sql.= " AND t.active > 0";
+        $sql.= " AND c.code IN (".$country_code.")";
+        $sql.= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                for ($i = 0; $i < $num; $i++)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $this->cache_vatrates[$i]['rowid']	= $obj->rowid;
+                    $this->cache_vatrates[$i]['code']	= $obj->code;
+                    $this->cache_vatrates[$i]['txtva']	= $obj->taux;
+                    $this->cache_vatrates[$i]['nprtva']	= $obj->recuperableonly;
+                    $this->cache_vatrates[$i]['localtax1']	    = $obj->localtax1;
+                    $this->cache_vatrates[$i]['localtax1_type']	= $obj->localtax1_type;
+                    $this->cache_vatrates[$i]['localtax2']	    = $obj->localtax2;
+                    $this->cache_vatrates[$i]['localtax2_type']	= $obj->localtax1_type;
+
+                    $this->cache_vatrates[$i]['label']	= $obj->taux.'%'.($obj->code?' ('.$obj->code.')':'');   // Label must contains only 0-9 , . % or *
+                    $this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1?$obj->localtax1:'0').'/'.($obj->localtax2?$obj->localtax2:'0').($obj->code?' ('.$obj->code.')':'');	// Must never be used as key, only label
+                    $positiverates='';
+                    if ($obj->taux) $positiverates.=($positiverates?'/':'').$obj->taux;
+                    if ($obj->localtax1) $positiverates.=($positiverates?'/':'').$obj->localtax1;
+                    if ($obj->localtax2) $positiverates.=($positiverates?'/':'').$obj->localtax2;
+                    if (empty($positiverates)) $positiverates='0';
+                    $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code?' ('.$obj->code.')':'');	// Must never be used as key, only label
+                }
+
+                return $num;
+            }
+            else
+            {
+                $this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry",$country_code).'</font>';
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error = '<font class="error">'.$this->db->error().'</font>';
+            return -2;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Output an HTML select vat rate.
+     *  The name of this function should be selectVat. We keep bad name for compatibility purpose.
+     *
+     *  @param	string	      $htmlname           Name of HTML select field
+     *  @param  float|string  $selectedrate       Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
+     *  @param  Societe	      $societe_vendeuse   Thirdparty seller
+     *  @param  Societe	      $societe_acheteuse  Thirdparty buyer
+     *  @param  int		      $idprod             Id product. O if unknown of NA.
+     *  @param  int		      $info_bits          Miscellaneous information on line (1 for NPR)
+     *  @param  int|string    $type               ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)
+     *                  		                  Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
+     *                  					      Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
+     *                  					      Si (vendeur et acheteur dans Communaute europeenne) et bien vendu = moyen de transports neuf (auto, bateau, avion), TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
+     *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.
+     *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
+     *                  					      Sinon la TVA proposee par defaut=0. Fin de regle.
+     *  @param	bool	     $options_only		  Return HTML options lines only (for ajax treatment)
+     *  @param  int          $mode                0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
+     *  @return	string
+     */
+    function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $mode=0)
+    {
+        // phpcs:enable
+        global $langs,$conf,$mysoc;
+
+        $langs->load('errors');
+
+        $return='';
+
+        // Define defaultnpr, defaultttx and defaultcode
+        $defaultnpr=($info_bits & 0x01);
+        $defaultnpr=(preg_match('/\*/',$selectedrate) ? 1 : $defaultnpr);
+        $defaulttx=str_replace('*','',$selectedrate);
+        $defaultcode='';
+        if (preg_match('/\((.*)\)/', $defaulttx, $reg))
+        {
+            $defaultcode=$reg[1];
+            $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
+        }
+        //var_dump($selectedrate.'-'.$defaulttx.'-'.$defaultnpr.'-'.$defaultcode);
+
+        // Check parameters
+        if (is_object($societe_vendeuse) && ! $societe_vendeuse->country_code)
+        {
+            if ($societe_vendeuse->id == $mysoc->id)
+            {
+                $return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
+            }
+            else
+            {
+                $return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
+            }
+            return $return;
+        }
+
+        //var_dump($societe_acheteuse);
+        //print "name=$name, selectedrate=$selectedrate, seller=".$societe_vendeuse->country_code." buyer=".$societe_acheteuse->country_code." buyer is company=".$societe_acheteuse->isACompany()." idprod=$idprod, info_bits=$info_bits type=$type";
+        //exit;
+
+        // Define list of countries to use to search VAT rates to show
+        // First we defined code_country to use to find list
+        if (is_object($societe_vendeuse))
+        {
+            $code_country="'".$societe_vendeuse->country_code."'";
+        }
+        else
+        {
+            $code_country="'".$mysoc->country_code."'";   // Pour compatibilite ascendente
+        }
+        if (! empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+            if (! isInEEC($societe_vendeuse) && (! is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && ! $societe_acheteuse->isACompany())))
+            {
+                // We also add the buyer
+                if (is_numeric($type))
+                {
+                    if ($type == 1) // We know product is a service
+                    {
+                        $code_country.=",'".$societe_acheteuse->country_code."'";
+                    }
+                }
+                else if (! $idprod)  // We don't know type of product
+                {
+                    $code_country.=",'".$societe_acheteuse->country_code."'";
+                }
+                else
+                {
+                    $prodstatic=new Product($this->db);
+                    $prodstatic->fetch($idprod);
+                    if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
+                    {
+                        $code_country.=",'".$societe_acheteuse->country_code."'";
+                    }
+                }
+            }
+        }
+
+        // Now we get list
+        $num = $this->load_cache_vatrates($code_country);   // If no vat defined, return -1 with message into this->error
+
+        if ($num > 0)
+        {
+            // Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
+            if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
+            {
+                $tmpthirdparty=new Societe($this->db);
+                $defaulttx=get_default_tva($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
+                $defaultnpr=get_default_npr($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
+                if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
+                    $defaultcode=$reg[1];
+                    $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
+                }
+                if (empty($defaulttx)) $defaultnpr=0;
+            }
+
+            // Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
+            // Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant
+            if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
+            {
+                if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) $defaulttx = $this->cache_vatrates[$num-1]['txtva'];
+                else $defaulttx=($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+            }
+
+            // Disabled if seller is not subject to VAT
+            $disabled=false; $title='';
+            if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0")
+            {
+                // Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses
+                if (empty($conf->global->OVERRIDE_VAT_FOR_EXPENSE_REPORT))
+                {
+                    $title=' title="'.$langs->trans('VATIsNotUsed').'"';
+                    $disabled=true;
+                }
+            }
+
+            if (! $options_only) $return.= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$title.'>';
+
+            $selectedfound=false;
+            foreach ($this->cache_vatrates as $rate)
+            {
+                // Keep only 0 if seller is not subject to VAT
+                if ($disabled && $rate['txtva'] != 0) continue;
+
+                // Define key to use into select list
+                $key = $rate['txtva'];
+                $key.= $rate['nprtva'] ? '*': '';
+                if ($mode > 0 && $rate['code']) $key.=' ('.$rate['code'].')';
+                if ($mode < 0) $key = $rate['rowid'];
+
+                $return.= '<option value="'.$key.'"';
+                if (! $selectedfound)
+                {
+                    if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
+                    {
+                        if ($defaultcode == $rate['code'])
+                        {
+                            $return.= ' selected';
+                            $selectedfound=true;
+                        }
+                    }
+                    elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+                        {
+                            $return.= ' selected';
+                            $selectedfound=true;
+                    }
+                }
+                $return.= '>';
+                //if (! empty($conf->global->MAIN_VAT_SHOW_POSITIVE_RATES))
+                if ($mysoc->country_code == 'IN' || ! empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
+                {
+                    $return.= $rate['labelpositiverates'];
+                }
+                else
+                {
+                    $return.= vatrate($rate['label']);
+                }
+                //$return.=($rate['code']?' '.$rate['code']:'');
+                $return.= (empty($rate['code']) && $rate['nprtva']) ? ' *': '';         // We show the *  (old behaviour only if new vat code is not used)
+
+                $return.= '</option>';
+            }
+
+            if (! $options_only) $return.= '</select>';
+        }
+        else
+        {
+            $return.= $this->error;
+        }
+
+        $this->num = $num;
+        return $return;
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+     *  Fields are preselected with :
+     *            	- set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
+     *            	- local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
+     *            	- Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)
+     *
+     *	@param	timestamp	$set_time 		Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
+     *	@param	string		$prefix			Prefix for fields name
+     *	@param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
+     *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
+     *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
+     *	@param	string		$form_name 		Not used
+     *	@param	int			$d				1=Show days, month, years
+     * 	@param	int			$addnowlink		Add a link "Now"
+     * 	@param	int			$nooutput		Do not output html string but return it
+     * 	@param 	int			$disabled		Disable input fields
+     *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
+     *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
+     *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
+     *  @return	string|void					Nothing or string if nooutput is 1
+     *  @deprecated
+     *  @see    form_date, select_month, select_year, select_dayofweek
+     */
+    function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
+    {
+        // phpcs:enable
+        $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
+        if (! empty($nooutput)) {
+            return $retstring;
+        }
+        print $retstring;
+        return;
+    }
+
+    /**
+     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+     *  Fields are preselected with :
+     *              - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
+     *              - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
+     *              - Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)
+     *
+     *  @param  timestamp   $set_time       Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
+     *  @param	string		$prefix			Prefix for fields name
+     *  @param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
+     *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
+     *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
+     *	@param	string		$form_name 		Not used
+     *	@param	int			$d				1=Show days, month, years
+     * 	@param	int			$addnowlink		Add a link "Now"
+     * 	@param 	int			$disabled		Disable input fields
+     *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
+     *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
+     *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
+     * 	@return string                      Html for selectDate
+     *  @see    form_date, select_month, select_year, select_dayofweek
+     */
+    function selectDate($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
+    {
+        global $conf,$langs;
+
+        $retstring='';
+
+        if ($prefix=='') $prefix='re';
+        if ($h == '') $h=0;
+        if ($m == '') $m=0;
+        $emptydate=0;
+        $emptyhours=0;
+        if ($empty == 1) { $emptydate=1; $emptyhours=1; }
+        if ($empty == 2) { $emptydate=0; $emptyhours=1; }
+        $orig_set_time=$set_time;
+
+        if ($set_time === '' && $emptydate == 0)
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+            $set_time = dol_now('tzuser')-(getServerTimeZoneInt('now')*3600); // set_time must be relative to PHP server timezone
+        }
+
+        // Analysis of the pre-selection date
+        if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/',$set_time,$reg))	// deprecated usage
+        {
+            // Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
+            $syear	= (! empty($reg[1])?$reg[1]:'');
+            $smonth	= (! empty($reg[2])?$reg[2]:'');
+            $sday	= (! empty($reg[3])?$reg[3]:'');
+            $shour	= (! empty($reg[4])?$reg[4]:'');
+            $smin	= (! empty($reg[5])?$reg[5]:'');
+        }
+        elseif (strval($set_time) != '' && $set_time != -1)
+        {
+            // set_time est un timestamps (0 possible)
+            $syear = dol_print_date($set_time, "%Y");
+            $smonth = dol_print_date($set_time, "%m");
+            $sday = dol_print_date($set_time, "%d");
+            if ($orig_set_time != '')
+            {
+                $shour = dol_print_date($set_time, "%H");
+                $smin = dol_print_date($set_time, "%M");
+                $ssec = dol_print_date($set_time, "%S");
+            }
+            else
+            {
+                $shour = '';
+                $smin = '';
+                $ssec = '';
+            }
+        }
+        else
+        {
+            // Date est '' ou vaut -1
+            $syear = '';
+            $smonth = '';
+            $sday = '';
+            $shour = !isset($conf->global->MAIN_DEFAULT_DATE_HOUR) ? ($h == -1 ? '23' : '') : $conf->global->MAIN_DEFAULT_DATE_HOUR;
+            $smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;
+            $ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;
+        }
+        if ($h == 3) $shour = '';
+        if ($m == 3) $smin = '';
+
+        // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
+        $usecalendar='combo';
+        if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) {
+            $usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == 'eldy')?'jquery':$conf->global->MAIN_POPUP_CALENDAR);
+        }
+
+        if ($d)
+        {
+            // Show date with popup
+            if ($usecalendar != 'combo')
+            {
+                $formated_date='';
+                //print "e".$set_time." t ".$conf->format_date_short;
+                if (strval($set_time) != '' && $set_time != -1)
+                {
+                    //$formated_date=dol_print_date($set_time,$conf->format_date_short);
+                    $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShortInput"));  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+                }
+
+                // Calendrier popup version eldy
+                if ($usecalendar == "eldy")
+                {
+                    // Zone de saisie manuelle de la date
+                    $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
+                    $retstring.=($disabled?' disabled':'');
+                    $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+                    $retstring.='>';
+
+                    // Icone calendrier
+                    if (! $disabled)
+                    {
+                        $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
+                        $base=DOL_URL_ROOT.'/core/';
+                        $retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
+                        $retstring.='>'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').'</button>';
+                    }
+                    else $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"),'calendarday','class="datecallink"').'</button>';
+
+                    $retstring.='<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
+                    $retstring.='<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
+                    $retstring.='<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
+                }
+                elseif ($usecalendar == 'jquery')
+                {
+                    if (! $disabled)
+                    {
+                        // Output javascript for datepicker
+                        $retstring.="<script type='text/javascript'>";
+                        $retstring.="$(function(){ $('#".$prefix."').datepicker({
+							dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
+							autoclose: true,
+							todayHighlight: true,";
+                            if (! empty($conf->dol_use_jmobile))
+                            {
+                                $retstring.="
+								beforeShow: function (input, datePicker) {
+									input.disabled = true;
+								},
+								onClose: function (dateText, datePicker) {
+									this.disabled = false;
+								},
+								";
+                            }
+                            // Note: We don't need monthNames, monthNamesShort, dayNames, dayNamesShort, dayNamesMin, they are set globally on datepicker component in lib_head.js.php
+                            if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
+                            {
+                            $retstring.="
+								showOn: 'button',
+								buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png',
+								buttonImageOnly: true";
+                            }
+                            $retstring.="
+							}) });";
+                        $retstring.="</script>";
+                    }
+
+                    // Zone de saisie manuelle de la date
+                    $retstring.='<div class="nowrap inline-block">';
+                    $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
+                    $retstring.=($disabled?' disabled':'');
+                    $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+                    $retstring.='>';
+
+                    // Icone calendrier
+                    if (! $disabled)
+                    {
+                        /* Not required. Managed by option buttonImage of jquery
+                		$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');
+                		$retstring.="<script type='text/javascript'>";
+                		$retstring.="jQuery(document).ready(function() {";
+                		$retstring.='	jQuery("#'.$prefix.'id").click(function() {';
+                		$retstring.="    	jQuery('#".$prefix."').focus();";
+                		$retstring.='    });';
+                		$retstring.='});';
+                		$retstring.="</script>";*/
+                    }
+                    else
+                    {
+                        $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"),'calendarday','class="datecallink"').'</button>';
+                    }
+
+                    $retstring.='</div>';
+                    $retstring.='<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
+                    $retstring.='<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
+                    $retstring.='<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
+                }
+                else
+                {
+                    $retstring.="Bad value of MAIN_POPUP_CALENDAR";
+                }
+            }
+            // Show date with combo selects
+            else
+            {
+                //$retstring.='<div class="inline-block">';
+                // Day
+                $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
+
+                if ($emptydate || $set_time == -1)
+                {
+                    $retstring.='<option value="0" selected>&nbsp;</option>';
+                }
+
+                for ($day = 1 ; $day <= 31; $day++)
+                {
+                    $retstring.='<option value="'.$day.'"'.($day == $sday ? ' selected':'').'>'.$day.'</option>';
+                }
+
+                $retstring.="</select>";
+
+                $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';
+                if ($emptydate || $set_time == -1)
+                {
+                    $retstring.='<option value="0" selected>&nbsp;</option>';
+                }
+
+                // Month
+                for ($month = 1 ; $month <= 12 ; $month++)
+                {
+                    $retstring.='<option value="'.$month.'"'.($month == $smonth?' selected':'').'>';
+                    $retstring.=dol_print_date(mktime(12,0,0,$month,1,2000),"%b");
+                    $retstring.="</option>";
+                }
+                $retstring.="</select>";
+
+                // Year
+                if ($emptydate || $set_time == -1)
+                {
+                    $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
+                }
+                else
+                {
+                    $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
+
+                    for ($year = $syear - 10; $year < $syear + 10 ; $year++)
+                    {
+                        $retstring.='<option value="'.$year.'"'.($year == $syear ? ' selected':'').'>'.$year.'</option>';
+                    }
+                    $retstring.="</select>\n";
+                }
+                //$retstring.='</div>';
+            }
+        }
+
+        if ($d && $h) $retstring.=($h==2?'<br>':' ');
+
+        if ($h)
+        {
+            // Show hour
+            $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'hour':'').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
+            if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
+            for ($hour = 0; $hour < 24; $hour++)
+            {
+                if (strlen($hour) < 2) $hour = "0" . $hour;
+                $retstring.='<option value="'.$hour.'"'.(($hour == $shour)?' selected':'').'>'.$hour.(empty($conf->dol_optimize_smallscreen)?'':'H').'</option>';
+            }
+            $retstring.='</select>';
+            if ($m && empty($conf->dol_optimize_smallscreen)) $retstring.=":";
+        }
+
+        if ($m)
+        {
+            // Show minutes
+            $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'min':'').'" id="'.$prefix.'min" name="'.$prefix.'min">';
+            if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
+            for ($min = 0; $min < 60 ; $min++)
+            {
+                if (strlen($min) < 2) $min = "0" . $min;
+                $retstring.='<option value="'.$min.'"'.(($min == $smin)?' selected':'').'>'.$min.(empty($conf->dol_optimize_smallscreen)?'':'').'</option>';
+            }
+            $retstring.='</select>';
+
+            $retstring.='<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';
+        }
+
+        // Add a "Now" link
+        if ($conf->use_javascript_ajax && $addnowlink)
+        {
+            // Script which will be inserted in the onClick of the "Now" link
+            $reset_scripts = "";
+
+            // Generate the date part, depending on the use or not of the javascript calendar
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(),'day').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(),'%d').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(),'%m').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(),'%Y').'\');';
+            /*if ($usecalendar == "eldy")
+            {
+                $base=DOL_URL_ROOT.'/core/';
+                $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
+            }
+            else
+            {
+                $reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';
+                $reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';
+                $reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';
+            }*/
+            // Update the hour part
+            if ($h)
+            {
+                if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(),'%H').'\');';
+                if ($fullday) $reset_scripts .= ' } ';
+            }
+            // Update the minute part
+            if ($m)
+            {
+                if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(),'%M').'\');';
+                if ($fullday) $reset_scripts .= ' } ';
+            }
+            // If reset_scripts is not empty, print the link with the reset_scripts in the onClick
+            if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
+            {
+                $retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';
+                $retstring.=$langs->trans("Now");
+                $retstring.='</button> ';
+            }
+        }
+
+        // Add a "Plus one hour" link
+        if ($conf->use_javascript_ajax && $addplusone)
+        {
+            // Script which will be inserted in the onClick of the "Add plusone" link
+            $reset_scripts = "";
+
+            // Generate the date part, depending on the use or not of the javascript calendar
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(),'day').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(),'%d').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(),'%m').'\');';
+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(),'%Y').'\');';
+            // Update the hour part
+            if ($h)
+            {
+                if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(),'%H').'\');';
+                if ($fullday) $reset_scripts .= ' } ';
+            }
+            // Update the minute part
+            if ($m)
+            {
+                if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(),'%M').'\');';
+                if ($fullday) $reset_scripts .= ' } ';
+            }
+            // If reset_scripts is not empty, print the link with the reset_scripts in the onClick
+            if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
+            {
+                $retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';
+                $retstring.=$langs->trans("DateStartPlusOne");
+                $retstring.='</button> ';
+            }
+        }
+
+        // Add a "Plus one hour" link
+        if ($conf->use_javascript_ajax && $adddateof)
+        {
+            $tmparray=dol_getdate($adddateof);
+            $retstring.=' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof,'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$langs->trans("DateInvoice").'</a>';
+        }
+
+        return $retstring;
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Function to show a form to select a duration on a page
+     *
+     *	@param	string	$prefix   		Prefix for input fields
+     *	@param  int	$iSecond  		    Default preselected duration (number of seconds or '')
+     * 	@param	int	$disabled           Disable the combo box
+     * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
+     *						            if 'text' input hour is in text and input min is a text,
+     *						            if 'textselect' input hour is in text and input min is a combo
+     *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
+     * 	@param	int	$nooutput		    Do not output html string but return it
+     *  @return	string|void
+     */
+    function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        $retstring='';
+
+        $hourSelected=0; $minSelected=0;
+
+        // Hours
+        if ($iSecond != '')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+            $hourSelected = convertSecondToTime($iSecond,'allhour');
+            $minSelected = convertSecondToTime($iSecond,'min');
+        }
+
+        if ($typehour=='select' )
+        {
+            $retstring.='<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled?' disabled':'').'>';
+            for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
+            {
+                $retstring.='<option value="'.$hour.'"';
+                if ($hourSelected == $hour)
+                {
+                    $retstring.=" selected";
+                }
+                $retstring.=">".$hour."</option>";
+            }
+            $retstring.="</select>";
+        }
+        elseif ($typehour=='text' || $typehour=='textselect')
+        {
+            $retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '')?((int) $hourSelected):'').'">';
+        }
+        else return 'BadValueForParameterTypeHour';
+
+        if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
+        else $retstring.='<span class="hideonsmartphone">:</span>';
+
+        // Minutes
+        if ($minunderhours) $retstring.='<br>';
+        else $retstring.='<span class="hideonsmartphone">&nbsp;</span>';
+
+        if ($typehour=='select' || $typehour=='textselect')
+        {
+            $retstring.='<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled?' disabled':'').'>';
+            for ($min = 0; $min <= 55; $min=$min+5)
+            {
+                $retstring.='<option value="'.$min.'"';
+                if ($minSelected == $min) $retstring.=' selected';
+                $retstring.='>'.$min.'</option>';
+            }
+            $retstring.="</select>";
+        }
+        elseif ($typehour=='text' )
+        {
+            $retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '')?((int) $minSelected):'').'">';
+        }
+
+        if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
+
+        //$retstring.="&nbsp;";
+
+        if (! empty($nooutput)) return $retstring;
+
+        print $retstring;
+        return;
+    }
+
+
+    /**
+     * Generic method to select a component from a combo list.
+     * This is the generic method that will replace all specific existing methods.
+     *
+     * @param 	string			$objectdesc			Objectclassname:Objectclasspath
+     * @param	string			$htmlname			Name of HTML select component
+     * @param	int				$preselectedvalue	Preselected value (ID of element)
+     * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
+     * @param	string			$searchkey			Search criteria
+     * @param	string			$placeholder		Place holder
+     * @param	string			$morecss			More CSS
+     * @param	string			$moreparams			More params provided to ajax call
+     * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)
+     * @return	string								Return HTML string
+     * @see selectForFormsList select_thirdparty
+     */
+    function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty='', $searchkey='', $placeholder='', $morecss='', $moreparams='', $forcecombo=0)
+    {
+        global $conf, $user;
+
+        $objecttmp = null;
+
+        $InfoFieldList = explode(":", $objectdesc);
+        $classname=$InfoFieldList[0];
+        $classpath=$InfoFieldList[1];
+        if (! empty($classpath))
+        {
+            dol_include_once($classpath);
+            if ($classname && class_exists($classname))
+            {
+                $objecttmp = new $classname($this->db);
+            }
+        }
+        if (! is_object($objecttmp))
+        {
+            dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);
+            return 'Error bad setup of type for field '.join(',', $InfoFieldList);
+        }
+
+        $prefixforautocompletemode=$objecttmp->element;
+        if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company';
+        $confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT';	// For example COMPANY_USE_SEARCH_TO_SELECT
+
+        dol_syslog(get_class($this)."::selectForForms", LOG_DEBUG);
+
+        $out='';
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->$confkeyforautocompletemode) && ! $forcecombo)
+        {
+            $objectdesc=$classname.':'.$classpath;
+            $urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
+            //if ($objecttmp->element == 'societe') $urlforajaxcall = DOL_URL_ROOT.'/societe/ajax/company.php';
+
+            // No immediate load of all database
+            $urloption='htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.($moreparams?$moreparams:'');
+            // Activate the auto complete using ajax call.
+            $out.=  ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
+            $out.= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
+            if ($placeholder) $placeholder=' placeholder="'.$placeholder.'"';
+            $out.= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$preselectedvalue.'"'.$placeholder.' />';
+        }
+        else
+        {
+            // Immediate load of all database
+            $out.=$this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo);
+        }
+
+        return $out;
+    }
+
+    /**
+     * Output html form to select an object.
+     * Note, this function is called by selectForForms or by ajax selectobject.php
+     *
+     * @param 	Object			$objecttmp			Object
+     * @param	string			$htmlname			Name of HTML select component
+     * @param	int				$preselectedvalue	Preselected value (ID of element)
+     * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
+     * @param	string			$searchkey			Search value
+     * @param	string			$placeholder		Place holder
+     * @param	string			$morecss			More CSS
+     * @param	string			$moreparams			More params provided to ajax call
+     * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)
+     * @param	int				$outputmode			0=HTML select string, 1=Array
+     * @return	string								Return HTML string
+     * @see selectForForms
+     */
+    function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty='', $searchkey='', $placeholder='', $morecss='', $moreparams='', $forcecombo=0, $outputmode=0)
+    {
+        global $conf, $langs, $user;
+
+        $prefixforautocompletemode=$objecttmp->element;
+        if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company';
+        $confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT';	// For example COMPANY_USE_SEARCH_TO_SELECT
+
+        $fieldstoshow='t.ref';
+        if (! empty($objecttmp->fields))	// For object that declare it, it is better to use declared fields ( like societe, contact, ...)
+        {
+            $tmpfieldstoshow='';
+            foreach($objecttmp->fields as $key => $val)
+            {
+                if ($val['showoncombobox']) $tmpfieldstoshow.=($tmpfieldstoshow?',':'').'t.'.$key;
+            }
+            if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
+        }
+
+        $out='';
+        $outarray=array();
+
+        $num=0;
+
+        // Search data
+        $sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX .$objecttmp->table_element." as t";
+        if ($objecttmp->ismultientitymanaged == 2)
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql.= " WHERE 1=1";
+        if(! empty($objecttmp->ismultientitymanaged)) $sql.= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+        if ($objecttmp->ismultientitymanaged == 1 && ! empty($user->societe_id))
+        {
+            if ($objecttmp->element == 'societe') $sql.= " AND t.rowid = ".$user->societe_id;
+                else $sql.= " AND t.fk_soc = ".$user->societe_id;
+        }
+        if ($searchkey != '') $sql.=natural_search(explode(',',$fieldstoshow), $searchkey);
+        if ($objecttmp->ismultientitymanaged == 2)
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND t.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        $sql.=$this->db->order($fieldstoshow,"ASC");
+        //$sql.=$this->db->plimit($limit, 0);
+
+        // Build output string
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if (! $forcecombo)
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+            }
+
+            // Construct $out and $outarray
+            $out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparams?' '.$moreparams:'').' name="'.$htmlname.'">'."\n";
+
+            // Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
+            $textifempty='&nbsp;';
+
+            //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+            if (! empty($conf->global->$confkeyforautocompletemode))
+            {
+                if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
+                else $textifempty.=$langs->trans("All");
+            }
+            if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $label='';
+                    $tmparray=explode(',', $fieldstoshow);
+                    foreach($tmparray as $key => $val)
+                    {
+                        $val = preg_replace('/t\./','',$val);
+                        $label .= (($label && $obj->$val)?' - ':'').$obj->$val;
+                    }
+                    if (empty($outputmode))
+                    {
+                        if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
+                        {
+                            $out.= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
+                        }
+                        else
+                        {
+                            $out.= '<option value="'.$obj->rowid.'">'.$label.'</option>';
+                        }
+                    }
+                    else
+                    {
+                        array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
+                    }
+
+                    $i++;
+                    if (($i % 10) == 0) $out.="\n";
+                }
+            }
+
+            $out.= '</select>'."\n";
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        $this->result=array('nbofelement'=>$num);
+
+        if ($outputmode) return $outarray;
+        return $out;
+    }
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
-	 *  Fields are preselected with :
-	 *            	- set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
-	 *            	- local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
-	 *            	- Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)
-	 *
-	 *	@param	timestamp	$set_time 		Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
-	 *	@param	string		$prefix			Prefix for fields name
-	 *	@param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
-	 *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
-	 *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
-	 *	@param	string		$form_name 		Not used
-	 *	@param	int			$d				1=Show days, month, years
-	 * 	@param	int			$addnowlink		Add a link "Now"
-	 * 	@param	int			$nooutput		Do not output html string but return it
-	 * 	@param 	int			$disabled		Disable input fields
-	 *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
-	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
-	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
-	 *  @return	string|void					Nothing or string if nooutput is 1
-     *  @deprecated
-	 *  @see    form_date, select_month, select_year, select_dayofweek
-	 */
-    function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
+     *	Return a HTML select string, built from an array of key+value.
+     *  Note: Do not apply langs->trans function on returned content, content may be entity encoded twice.
+     *
+     *	@param	string			$htmlname			Name of html select area. Must start with "multi" if this is a multiselect
+     *	@param	array			$array				Array (key => value)
+     *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect
+     *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (key is -1 and value is '' or '&nbsp;' if 1, key is -1 and value is text if string), <0 to add an empty value with key that is this value.
+     *	@param	int				$key_in_label		1 to show key into label with format "[key] value"
+     *	@param	int				$value_as_key		1 to use value as key
+     *	@param  string			$moreparam			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+     *	@param  int				$translate			1=Translate and encode value
+     * 	@param	int				$maxlen				Length maximum for labels
+     * 	@param	int				$disabled			Html select box is disabled
+     *  @param	string			$sort				'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
+     *  @param	string			$morecss			Add more class to css styles
+     *  @param	int				$addjscombo			Add js combo
+     *  @param  string          $moreparamonempty	Add more param on the empty option line. Not used if show_empty not set
+     *  @param  int             $disablebademail	Check if an email is found into value and if not disable and colorize entry
+     *  @param  int             $nohtmlescape		No html escaping.
+     * 	@return	string								HTML select string.
+     *  @see multiselectarray
+     */
+    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0, $nohtmlescape=0)
     {
-        // phpcs:enable
-        $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
-        if (! empty($nooutput)) {
-            return $retstring;
+        global $conf, $langs;
+
+        // Do we want a multiselect ?
+        //$jsbeautify = 0;
+        //if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;
+        $jsbeautify = 1;
+
+        if ($value_as_key) $array=array_combine($array, $array);
+
+        $out='';
+
+        // Add code for jquery to use multiselect
+        if ($addjscombo && $jsbeautify)
+        {
+            $minLengthToAutocomplete=0;
+            $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?(constant('REQUIRE_JQUERY_MULTISELECT')?constant('REQUIRE_JQUERY_MULTISELECT'):'select2'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+
+            // Enhance with select2
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out .= ajax_combobox($htmlname);
         }
-        print $retstring;
-        return;
-    }
 
-    /**
-     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
-	 *  Fields are preselected with :
-	 *              - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
-	 *              - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
-	 *              - Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)
-	 *
-	 *  @param  timestamp   $set_time       Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
-	 *  @param	string		$prefix			Prefix for fields name
-	 *  @param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
-	 *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
-	 *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
-	 *	@param	string		$form_name 		Not used
-	 *	@param	int			$d				1=Show days, month, years
-	 * 	@param	int			$addnowlink		Add a link "Now"
-	 * 	@param 	int			$disabled		Disable input fields
-	 *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
-	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
-	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
-	 * 	@return string                      Html for selectDate
-	 *  @see    form_date, select_month, select_year, select_dayofweek
-	 */
-	function selectDate($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
-	{
-		global $conf,$langs;
-
-		$retstring='';
-
-		if ($prefix=='') $prefix='re';
-		if ($h == '') $h=0;
-		if ($m == '') $m=0;
-		$emptydate=0;
-		$emptyhours=0;
-		if ($empty == 1) { $emptydate=1; $emptyhours=1; }
-		if ($empty == 2) { $emptydate=0; $emptyhours=1; }
-		$orig_set_time=$set_time;
-
-		if ($set_time === '' && $emptydate == 0)
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-			$set_time = dol_now('tzuser')-(getServerTimeZoneInt('now')*3600); // set_time must be relative to PHP server timezone
-		}
-
-		// Analysis of the pre-selection date
-		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/',$set_time,$reg))	// deprecated usage
-		{
-			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
-			$syear	= (! empty($reg[1])?$reg[1]:'');
-			$smonth	= (! empty($reg[2])?$reg[2]:'');
-			$sday	= (! empty($reg[3])?$reg[3]:'');
-			$shour	= (! empty($reg[4])?$reg[4]:'');
-			$smin	= (! empty($reg[5])?$reg[5]:'');
-		}
-		elseif (strval($set_time) != '' && $set_time != -1)
-		{
-			// set_time est un timestamps (0 possible)
-			$syear = dol_print_date($set_time, "%Y");
-			$smonth = dol_print_date($set_time, "%m");
-			$sday = dol_print_date($set_time, "%d");
-			if ($orig_set_time != '')
-			{
-				$shour = dol_print_date($set_time, "%H");
-				$smin = dol_print_date($set_time, "%M");
-				$ssec = dol_print_date($set_time, "%S");
-			}
-			else
-			{
-				$shour = '';
-				$smin = '';
-				$ssec = '';
-			}
-		}
-		else
-		{
-			// Date est '' ou vaut -1
-			$syear = '';
-			$smonth = '';
-			$sday = '';
-			$shour = !isset($conf->global->MAIN_DEFAULT_DATE_HOUR) ? ($h == -1 ? '23' : '') : $conf->global->MAIN_DEFAULT_DATE_HOUR;
-			$smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;
-			$ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;
-		}
-		if ($h == 3) $shour = '';
-		if ($m == 3) $smin = '';
-
-		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
-		$usecalendar='combo';
-		if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) {
-			$usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == 'eldy')?'jquery':$conf->global->MAIN_POPUP_CALENDAR);
-		}
-
-		if ($d)
-		{
-			// Show date with popup
-			if ($usecalendar != 'combo')
-			{
-				$formated_date='';
-				//print "e".$set_time." t ".$conf->format_date_short;
-				if (strval($set_time) != '' && $set_time != -1)
-				{
-					//$formated_date=dol_print_date($set_time,$conf->format_date_short);
-					$formated_date=dol_print_date($set_time,$langs->trans("FormatDateShortInput"));  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
-				}
-
-				// Calendrier popup version eldy
-				if ($usecalendar == "eldy")
-				{
-					// Zone de saisie manuelle de la date
-					$retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
-					$retstring.=($disabled?' disabled':'');
-					$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
-					$retstring.='>';
-
-					// Icone calendrier
-					if (! $disabled)
-					{
-						$retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
-						$base=DOL_URL_ROOT.'/core/';
-						$retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
-						$retstring.='>'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').'</button>';
-					}
-					else $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"),'calendarday','class="datecallink"').'</button>';
-
-					$retstring.='<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
-					$retstring.='<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
-					$retstring.='<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				elseif ($usecalendar == 'jquery')
-				{
-					if (! $disabled)
-					{
-						// Output javascript for datepicker
-						$retstring.="<script type='text/javascript'>";
-						$retstring.="$(function(){ $('#".$prefix."').datepicker({
-							dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
-							autoclose: true,
-							todayHighlight: true,";
-							if (! empty($conf->dol_use_jmobile))
-							{
-								$retstring.="
-								beforeShow: function (input, datePicker) {
-									input.disabled = true;
-								},
-								onClose: function (dateText, datePicker) {
-									this.disabled = false;
-								},
-								";
-							}
-							// Note: We don't need monthNames, monthNamesShort, dayNames, dayNamesShort, dayNamesMin, they are set globally on datepicker component in lib_head.js.php
-							if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
-							{
-							$retstring.="
-								showOn: 'button',
-								buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png',
-								buttonImageOnly: true";
-							}
-							$retstring.="
-							}) });";
-						$retstring.="</script>";
-					}
+        $out.='<select id="'.preg_replace('/^\./','',$htmlname).'" '.($disabled?'disabled ':'').'class="flat '.(preg_replace('/^\./','',$htmlname)).($morecss?' '.$morecss:'').'"';
+        $out.=' name="'.preg_replace('/^\./','',$htmlname).'" '.($moreparam?$moreparam:'');
+        $out.='>';
 
-					// Zone de saisie manuelle de la date
-					$retstring.='<div class="nowrap inline-block">';
-					$retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
-					$retstring.=($disabled?' disabled':'');
-					$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
-					$retstring.='>';
-
-					// Icone calendrier
-					if (! $disabled)
-					{
-						/* Not required. Managed by option buttonImage of jquery
-                		$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');
-                		$retstring.="<script type='text/javascript'>";
-                		$retstring.="jQuery(document).ready(function() {";
-                		$retstring.='	jQuery("#'.$prefix.'id").click(function() {';
-                		$retstring.="    	jQuery('#".$prefix."').focus();";
-                		$retstring.='    });';
-                		$retstring.='});';
-                		$retstring.="</script>";*/
-					}
-					else
-					{
-						$retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"),'calendarday','class="datecallink"').'</button>';
-					}
+        if ($show_empty)
+        {
+            $textforempty=' ';
+            if (! empty($conf->use_javascript_ajax)) $textforempty='&nbsp;';	// If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+            if (! is_numeric($show_empty)) $textforempty=$show_empty;
+            $out.='<option class="optiongrey" '.($moreparamonempty?$moreparamonempty.' ':'').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ?' selected':'').'>'.$textforempty.'</option>'."\n";
+        }
 
-					$retstring.='</div>';
-					$retstring.='<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
-					$retstring.='<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
-					$retstring.='<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				else
-				{
-					$retstring.="Bad value of MAIN_POPUP_CALENDAR";
-				}
-			}
-			// Show date with combo selects
-			else
-			{
-				//$retstring.='<div class="inline-block">';
-				// Day
-				$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
-
-				if ($emptydate || $set_time == -1)
-				{
-					$retstring.='<option value="0" selected>&nbsp;</option>';
-				}
-
-				for ($day = 1 ; $day <= 31; $day++)
-				{
-					$retstring.='<option value="'.$day.'"'.($day == $sday ? ' selected':'').'>'.$day.'</option>';
-				}
-
-				$retstring.="</select>";
-
-				$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';
-				if ($emptydate || $set_time == -1)
-				{
-					$retstring.='<option value="0" selected>&nbsp;</option>';
-				}
-
-				// Month
-				for ($month = 1 ; $month <= 12 ; $month++)
-				{
-					$retstring.='<option value="'.$month.'"'.($month == $smonth?' selected':'').'>';
-					$retstring.=dol_print_date(mktime(12,0,0,$month,1,2000),"%b");
-					$retstring.="</option>";
-				}
-				$retstring.="</select>";
-
-				// Year
-				if ($emptydate || $set_time == -1)
-				{
-					$retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
-				}
-				else
-				{
-					$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
-
-					for ($year = $syear - 10; $year < $syear + 10 ; $year++)
-					{
-						$retstring.='<option value="'.$year.'"'.($year == $syear ? ' selected':'').'>'.$year.'</option>';
-					}
-					$retstring.="</select>\n";
-				}
-				//$retstring.='</div>';
-			}
-		}
-
-		if ($d && $h) $retstring.=($h==2?'<br>':' ');
-
-		if ($h)
-		{
-			// Show hour
-			$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'hour':'').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
-			if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
-			for ($hour = 0; $hour < 24; $hour++)
-			{
-				if (strlen($hour) < 2) $hour = "0" . $hour;
-				$retstring.='<option value="'.$hour.'"'.(($hour == $shour)?' selected':'').'>'.$hour.(empty($conf->dol_optimize_smallscreen)?'':'H').'</option>';
-			}
-			$retstring.='</select>';
-			if ($m && empty($conf->dol_optimize_smallscreen)) $retstring.=":";
-		}
-
-		if ($m)
-		{
-			// Show minutes
-			$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'min':'').'" id="'.$prefix.'min" name="'.$prefix.'min">';
-			if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
-			for ($min = 0; $min < 60 ; $min++)
-			{
-				if (strlen($min) < 2) $min = "0" . $min;
-				$retstring.='<option value="'.$min.'"'.(($min == $smin)?' selected':'').'>'.$min.(empty($conf->dol_optimize_smallscreen)?'':'').'</option>';
-			}
-			$retstring.='</select>';
-
-			$retstring.='<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';
-		}
-
-		// Add a "Now" link
-		if ($conf->use_javascript_ajax && $addnowlink)
-		{
-			// Script which will be inserted in the onClick of the "Now" link
-			$reset_scripts = "";
-
-			// Generate the date part, depending on the use or not of the javascript calendar
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(),'day').'\');';
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(),'%d').'\');';
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(),'%m').'\');';
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(),'%Y').'\');';
-			/*if ($usecalendar == "eldy")
+        if (is_array($array))
+        {
+            // Translate
+            if ($translate)
             {
-                $base=DOL_URL_ROOT.'/core/';
-                $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
+                foreach($array as $key => $value)
+                {
+                    $array[$key]=$langs->trans($value);
+                }
             }
-            else
+
+            // Sort
+            if ($sort == 'ASC') asort($array);
+            elseif ($sort == 'DESC') arsort($array);
+
+            foreach($array as $key => $value)
             {
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';
-            }*/
-			// Update the hour part
-			if ($h)
-			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
-				//$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
-				$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(),'%H').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
-			}
-			// Update the minute part
-			if ($m)
-			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
-				//$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
-				$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(),'%M').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
-			}
-			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
-			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
-			{
-				$retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';
-				$retstring.=$langs->trans("Now");
-				$retstring.='</button> ';
-			}
-		}
-
-		// Add a "Plus one hour" link
-		if ($conf->use_javascript_ajax && $addplusone)
-		{
-			// Script which will be inserted in the onClick of the "Add plusone" link
-			$reset_scripts = "";
-
-			// Generate the date part, depending on the use or not of the javascript calendar
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(),'day').'\');';
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(),'%d').'\');';
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(),'%m').'\');';
-			$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(),'%Y').'\');';
-			// Update the hour part
-			if ($h)
-			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
-				$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(),'%H').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
-			}
-			// Update the minute part
-			if ($m)
-			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
-				$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(),'%M').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
-			}
-			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
-			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
-			{
-				$retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';
-				$retstring.=$langs->trans("DateStartPlusOne");
-				$retstring.='</button> ';
-			}
-		}
-
-		// Add a "Plus one hour" link
-		if ($conf->use_javascript_ajax && $adddateof)
-		{
-			$tmparray=dol_getdate($adddateof);
-			$retstring.=' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof,'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$langs->trans("DateInvoice").'</a>';
-		}
-
-		return $retstring;
-	}
+                $disabled=''; $style='';
+                if (! empty($disablebademail))
+                {
+                    if (! preg_match('/&lt;.+@.+&gt;/', $value))
+                    {
+                        //$value=preg_replace('/'.preg_quote($a,'/').'/', $b, $value);
+                        $disabled=' disabled';
+                        $style=' class="warning"';
+                    }
+                }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to show a form to select a duration on a page
-	 *
-	 *	@param	string	$prefix   		Prefix for input fields
-	 *	@param  int	$iSecond  		    Default preselected duration (number of seconds or '')
-	 * 	@param	int	$disabled           Disable the combo box
-	 * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
-	 *						            if 'text' input hour is in text and input min is a text,
-	 *						            if 'textselect' input hour is in text and input min is a combo
-	 *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
-	 * 	@param	int	$nooutput		    Do not output html string but return it
-	 *  @return	string|void
-	 */
-	function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0)
-	{
-        // phpcs:enable
-		global $langs;
-
-		$retstring='';
-
-		$hourSelected=0; $minSelected=0;
-
-		// Hours
-		if ($iSecond != '')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-			$hourSelected = convertSecondToTime($iSecond,'allhour');
-			$minSelected = convertSecondToTime($iSecond,'min');
-		}
-
-		if ($typehour=='select' )
-		{
-			$retstring.='<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled?' disabled':'').'>';
-			for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
-			{
-				$retstring.='<option value="'.$hour.'"';
-				if ($hourSelected == $hour)
-				{
-					$retstring.=" selected";
-				}
-				$retstring.=">".$hour."</option>";
-			}
-			$retstring.="</select>";
-		}
-		elseif ($typehour=='text' || $typehour=='textselect')
-		{
-			$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '')?((int) $hourSelected):'').'">';
-		}
-		else return 'BadValueForParameterTypeHour';
-
-		if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
-		else $retstring.='<span class="hideonsmartphone">:</span>';
-
-		// Minutes
-		if ($minunderhours) $retstring.='<br>';
-		else $retstring.='<span class="hideonsmartphone">&nbsp;</span>';
-
-		if ($typehour=='select' || $typehour=='textselect')
-		{
-			$retstring.='<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled?' disabled':'').'>';
-			for ($min = 0; $min <= 55; $min=$min+5)
-			{
-				$retstring.='<option value="'.$min.'"';
-				if ($minSelected == $min) $retstring.=' selected';
-				$retstring.='>'.$min.'</option>';
-			}
-			$retstring.="</select>";
-		}
-		elseif ($typehour=='text' )
-		{
-			$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '')?((int) $minSelected):'').'">';
-		}
-
-		if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
-
-		//$retstring.="&nbsp;";
-
-		if (! empty($nooutput)) return $retstring;
-
-		print $retstring;
-		return;
-	}
-
-
-	/**
-	 * Generic method to select a component from a combo list.
-	 * This is the generic method that will replace all specific existing methods.
-	 *
-	 * @param 	string			$objectdesc			Objectclassname:Objectclasspath
-	 * @param	string			$htmlname			Name of HTML select component
-	 * @param	int				$preselectedvalue	Preselected value (ID of element)
-	 * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
-	 * @param	string			$searchkey			Search criteria
-	 * @param	string			$placeholder		Place holder
-	 * @param	string			$morecss			More CSS
-	 * @param	string			$moreparams			More params provided to ajax call
-	 * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)
-	 * @return	string								Return HTML string
-	 * @see selectForFormsList select_thirdparty
-	 */
-	function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty='', $searchkey='', $placeholder='', $morecss='', $moreparams='', $forcecombo=0)
-	{
-		global $conf, $user;
-
-		$objecttmp = null;
-
-		$InfoFieldList = explode(":", $objectdesc);
-		$classname=$InfoFieldList[0];
-		$classpath=$InfoFieldList[1];
-		if (! empty($classpath))
-		{
-			dol_include_once($classpath);
-			if ($classname && class_exists($classname))
-			{
-				$objecttmp = new $classname($this->db);
-			}
-		}
-		if (! is_object($objecttmp))
-		{
-			dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);
-			return 'Error bad setup of type for field '.join(',', $InfoFieldList);
-		}
-
-		$prefixforautocompletemode=$objecttmp->element;
-		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company';
-		$confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT';	// For example COMPANY_USE_SEARCH_TO_SELECT
-
-		dol_syslog(get_class($this)."::selectForForms", LOG_DEBUG);
-
-		$out='';
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->$confkeyforautocompletemode) && ! $forcecombo)
-		{
-			$objectdesc=$classname.':'.$classpath;
-			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
-			//if ($objecttmp->element == 'societe') $urlforajaxcall = DOL_URL_ROOT.'/societe/ajax/company.php';
-
-			// No immediate load of all database
-			$urloption='htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.($moreparams?$moreparams:'');
-			// Activate the auto complete using ajax call.
-			$out.=  ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
-			$out.= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
-			if ($placeholder) $placeholder=' placeholder="'.$placeholder.'"';
-			$out.= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$preselectedvalue.'"'.$placeholder.' />';
-		}
-		else
-		{
-			// Immediate load of all database
-			$out.=$this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo);
-		}
-
-		return $out;
-	}
-
-	/**
-	 * Output html form to select an object.
-	 * Note, this function is called by selectForForms or by ajax selectobject.php
-	 *
-	 * @param 	Object			$objecttmp			Object
-	 * @param	string			$htmlname			Name of HTML select component
-	 * @param	int				$preselectedvalue	Preselected value (ID of element)
-	 * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
-	 * @param	string			$searchkey			Search value
-	 * @param	string			$placeholder		Place holder
-	 * @param	string			$morecss			More CSS
-	 * @param	string			$moreparams			More params provided to ajax call
-	 * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)
-	 * @param	int				$outputmode			0=HTML select string, 1=Array
-	 * @return	string								Return HTML string
-	 * @see selectForForms
-	 */
-	function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty='', $searchkey='', $placeholder='', $morecss='', $moreparams='', $forcecombo=0, $outputmode=0)
-	{
-		global $conf, $langs, $user;
-
-		$prefixforautocompletemode=$objecttmp->element;
-		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company';
-		$confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT';	// For example COMPANY_USE_SEARCH_TO_SELECT
-
-		$fieldstoshow='t.ref';
-		if (! empty($objecttmp->fields))	// For object that declare it, it is better to use declared fields ( like societe, contact, ...)
-		{
-			$tmpfieldstoshow='';
-			foreach($objecttmp->fields as $key => $val)
-			{
-				if ($val['showoncombobox']) $tmpfieldstoshow.=($tmpfieldstoshow?',':'').'t.'.$key;
-			}
-			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
-		}
-
-		$out='';
-		$outarray=array();
-
-		$num=0;
-
-		// Search data
-		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX .$objecttmp->table_element." as t";
-		if ($objecttmp->ismultientitymanaged == 2)
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE 1=1";
-		if(! empty($objecttmp->ismultientitymanaged)) $sql.= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
-		if ($objecttmp->ismultientitymanaged == 1 && ! empty($user->societe_id))
-		{
-			if ($objecttmp->element == 'societe') $sql.= " AND t.rowid = ".$user->societe_id;
-				else $sql.= " AND t.fk_soc = ".$user->societe_id;
-		}
-		if ($searchkey != '') $sql.=natural_search(explode(',',$fieldstoshow), $searchkey);
-		if ($objecttmp->ismultientitymanaged == 2)
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND t.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		$sql.=$this->db->order($fieldstoshow,"ASC");
-		//$sql.=$this->db->plimit($limit, 0);
-
-		// Build output string
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if (! $forcecombo)
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
-			}
-
-			// Construct $out and $outarray
-			$out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparams?' '.$moreparams:'').' name="'.$htmlname.'">'."\n";
-
-			// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
-			$textifempty='&nbsp;';
-
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (! empty($conf->global->$confkeyforautocompletemode))
-			{
-				if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
-				else $textifempty.=$langs->trans("All");
-			}
-			if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$label='';
-					$tmparray=explode(',', $fieldstoshow);
-					foreach($tmparray as $key => $val)
-					{
-						$val = preg_replace('/t\./','',$val);
-						$label .= (($label && $obj->$val)?' - ':'').$obj->$val;
-					}
-					if (empty($outputmode))
-					{
-						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
-						{
-							$out.= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
-							$out.= '<option value="'.$obj->rowid.'">'.$label.'</option>';
-						}
-					}
-					else
-					{
-						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
-					}
+                if ($key_in_label)
+                {
+                    if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen?dol_trunc($value,$maxlen):$value));
+                    else $selectOptionValue = $key.' - '.($maxlen?dol_trunc($value,$maxlen):$value);
+                }
+                else
+                {
+                    if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen?dol_trunc($value,$maxlen):$value);
+                    else $selectOptionValue = $maxlen?dol_trunc($value,$maxlen):$value;
+                    if ($value == '' || $value == '-') $selectOptionValue='&nbsp;';
+                }
 
-					$i++;
-					if (($i % 10) == 0) $out.="\n";
-				}
-			}
-
-			$out.= '</select>'."\n";
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		$this->result=array('nbofelement'=>$num);
-
-		if ($outputmode) return $outarray;
-		return $out;
-	}
-
-
-	/**
-	 *	Return a HTML select string, built from an array of key+value.
-	 *  Note: Do not apply langs->trans function on returned content, content may be entity encoded twice.
-	 *
-	 *	@param	string			$htmlname			Name of html select area. Must start with "multi" if this is a multiselect
-	 *	@param	array			$array				Array (key => value)
-	 *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect
-	 *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (key is -1 and value is '' or '&nbsp;' if 1, key is -1 and value is text if string), <0 to add an empty value with key that is this value.
-	 *	@param	int				$key_in_label		1 to show key into label with format "[key] value"
-	 *	@param	int				$value_as_key		1 to use value as key
-	 *	@param  string			$moreparam			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
-	 *	@param  int				$translate			1=Translate and encode value
-	 * 	@param	int				$maxlen				Length maximum for labels
-	 * 	@param	int				$disabled			Html select box is disabled
-	 *  @param	string			$sort				'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
-	 *  @param	string			$morecss			Add more class to css styles
-	 *  @param	int				$addjscombo			Add js combo
-	 *  @param  string          $moreparamonempty	Add more param on the empty option line. Not used if show_empty not set
-	 *  @param  int             $disablebademail	Check if an email is found into value and if not disable and colorize entry
-	 *  @param  int             $nohtmlescape		No html escaping.
-	 * 	@return	string								HTML select string.
-	 *  @see multiselectarray
-	 */
-	static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0, $nohtmlescape=0)
-	{
-		global $conf, $langs;
-
-		// Do we want a multiselect ?
-		//$jsbeautify = 0;
-		//if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;
-		$jsbeautify = 1;
-
-		if ($value_as_key) $array=array_combine($array, $array);
-
-		$out='';
-
-		// Add code for jquery to use multiselect
-		if ($addjscombo && $jsbeautify)
-		{
-			$minLengthToAutocomplete=0;
-			$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?(constant('REQUIRE_JQUERY_MULTISELECT')?constant('REQUIRE_JQUERY_MULTISELECT'):'select2'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-
-			// Enhance with select2
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname);
-		}
-
-		$out.='<select id="'.preg_replace('/^\./','',$htmlname).'" '.($disabled?'disabled ':'').'class="flat '.(preg_replace('/^\./','',$htmlname)).($morecss?' '.$morecss:'').'"';
-		$out.=' name="'.preg_replace('/^\./','',$htmlname).'" '.($moreparam?$moreparam:'');
-		$out.='>';
-
-		if ($show_empty)
-		{
-			$textforempty=' ';
-			if (! empty($conf->use_javascript_ajax)) $textforempty='&nbsp;';	// If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
-			if (! is_numeric($show_empty)) $textforempty=$show_empty;
-			$out.='<option class="optiongrey" '.($moreparamonempty?$moreparamonempty.' ':'').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ?' selected':'').'>'.$textforempty.'</option>'."\n";
-		}
-
-		if (is_array($array))
-		{
-			// Translate
-			if ($translate)
-			{
-				foreach($array as $key => $value)
-				{
-					$array[$key]=$langs->trans($value);
-				}
-			}
-
-			// Sort
-			if ($sort == 'ASC') asort($array);
-			elseif ($sort == 'DESC') arsort($array);
-
-			foreach($array as $key => $value)
-			{
-				$disabled=''; $style='';
-				if (! empty($disablebademail))
-				{
-					if (! preg_match('/&lt;.+@.+&gt;/', $value))
-					{
-						//$value=preg_replace('/'.preg_quote($a,'/').'/', $b, $value);
-						$disabled=' disabled';
-						$style=' class="warning"';
-					}
-				}
-
-				if ($key_in_label)
-				{
-					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen?dol_trunc($value,$maxlen):$value));
-					else $selectOptionValue = $key.' - '.($maxlen?dol_trunc($value,$maxlen):$value);
-				}
-				else
-				{
-					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen?dol_trunc($value,$maxlen):$value);
-					else $selectOptionValue = $maxlen?dol_trunc($value,$maxlen):$value;
-					if ($value == '' || $value == '-') $selectOptionValue='&nbsp;';
-				}
-
-				$out.='<option value="'.$key.'"';
-				$out.=$style.$disabled;
-				if ($id != '' && $id == $key && ! $disabled) $out.=' selected';		// To preselect a value
-				if ($nohtmlescape) $out.=' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
-				$out.='>';
-				//var_dump($selectOptionValue);
-				$out.=$selectOptionValue;
-				$out.="</option>\n";
-			}
-		}
-
-		$out.="</select>";
-		return $out;
-	}
-
-
-	/**
-	 *	Return a HTML select string, built from an array of key+value, but content returned into select come from an Ajax call of an URL.
-	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
-	 *
-	 *	@param	string	$htmlname       		Name of html select area
-	 *	@param	string	$url					Url. Must return a json_encode of array(key=>array('text'=>'A text', 'url'=>'An url'), ...)
-	 *	@param	string	$id             		Preselected key
-	 *	@param  string	$moreparam      		Add more parameters onto the select tag
-	 *	@param  string	$moreparamtourl 		Add more parameters onto the Ajax called URL
-	 * 	@param	int		$disabled				Html select box is disabled
-	 *  @param	int		$minimumInputLength		Minimum Input Length
-	 *  @param	string	$morecss				Add more class to css styles
-	 *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
-	 *  @param  string  $placeholder            String to use as placeholder
-	 *  @param  integer $acceptdelayedhtml      1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
-	 * 	@return	string   						HTML select string
-	 *  @see selectArrayFilter, ajax_combobox in ajax.lib.php
-	 */
-	static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
-	{
-		global $conf, $langs;
-		global $delayedhtmlcontent;
-
-		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
-
-		$out='<select type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'"></select>';
-
-		$tmpplugin='select2';
-		$outdelayed="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+                $out.='<option value="'.$key.'"';
+                $out.=$style.$disabled;
+                if ($id != '' && $id == $key && ! $disabled) $out.=' selected';		// To preselect a value
+                if ($nohtmlescape) $out.=' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
+                $out.='>';
+                //var_dump($selectOptionValue);
+                $out.=$selectOptionValue;
+                $out.="</option>\n";
+            }
+        }
+
+        $out.="</select>";
+        return $out;
+    }
+
+
+    /**
+     *	Return a HTML select string, built from an array of key+value, but content returned into select come from an Ajax call of an URL.
+     *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
+     *
+     *	@param	string	$htmlname       		Name of html select area
+     *	@param	string	$url					Url. Must return a json_encode of array(key=>array('text'=>'A text', 'url'=>'An url'), ...)
+     *	@param	string	$id             		Preselected key
+     *	@param  string	$moreparam      		Add more parameters onto the select tag
+     *	@param  string	$moreparamtourl 		Add more parameters onto the Ajax called URL
+     * 	@param	int		$disabled				Html select box is disabled
+     *  @param	int		$minimumInputLength		Minimum Input Length
+     *  @param	string	$morecss				Add more class to css styles
+     *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
+     *  @param  string  $placeholder            String to use as placeholder
+     *  @param  integer $acceptdelayedhtml      1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+     * 	@return	string   						HTML select string
+     *  @see selectArrayFilter, ajax_combobox in ajax.lib.php
+     */
+    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
+    {
+        global $conf, $langs;
+        global $delayedhtmlcontent;
+
+        // TODO Use an internal dolibarr component instead of select2
+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+
+        $out='<select type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'"></select>';
+
+        $tmpplugin='select2';
+        $outdelayed="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 	    	<script type="text/javascript">
 	    	$(document).ready(function () {
 
@@ -5913,57 +5913,57 @@ 
     	   });
 	       </script>';
 
-		if ($acceptdelayedhtml)
-		{
-			$delayedhtmlcontent.=$outdelayed;
-		}
-		else
-		{
-			$out.=$outdelayed;
-		}
-		return $out;
-	}
-
-	/**
-	 *	Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
-	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
-	 *
-	 *	@param	string	$htmlname       		Name of html select area
-	 *	@param	string	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)
-	 *	@param	string	$id             		Preselected key
-	 *	@param  string	$moreparam      		Add more parameters onto the select tag
-	 *	@param	int		$disableFiltering		If set to 1, results are not filtered with searched string
-	 * 	@param	int		$disabled				Html select box is disabled
-	 *  @param	int		$minimumInputLength		Minimum Input Length
-	 *  @param	string	$morecss				Add more class to css styles
-	 *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
-	 *  @param  string  $placeholder            String to use as placeholder
-	 *  @param  integer $acceptdelayedhtml      1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
-	 * 	@return	string   						HTML select string
-	 *  @see selectArrayAjax, ajax_combobox in ajax.lib.php
-	 */
-	static function selectArrayFilter($htmlname, $array, $id='', $moreparam='', $disableFiltering=0, $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
-	{
-		global $conf, $langs;
-		global $delayedhtmlcontent;
-
-		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
-
-		$out='<select type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'"><option></option></select>';
-
-		$formattedarrayresult = array();
-
-		foreach($array as $key => $value) {
-			$o = new stdClass();
-			$o->id = $key;
-			$o->text = $value['text'];
-			$o->url = $value['url'];
-			$formattedarrayresult[] = $o;
-		}
-
-		$tmpplugin='select2';
-		$outdelayed="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+        if ($acceptdelayedhtml)
+        {
+            $delayedhtmlcontent.=$outdelayed;
+        }
+        else
+        {
+            $out.=$outdelayed;
+        }
+        return $out;
+    }
+
+    /**
+     *	Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
+     *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
+     *
+     *	@param	string	$htmlname       		Name of html select area
+     *	@param	string	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)
+     *	@param	string	$id             		Preselected key
+     *	@param  string	$moreparam      		Add more parameters onto the select tag
+     *	@param	int		$disableFiltering		If set to 1, results are not filtered with searched string
+     * 	@param	int		$disabled				Html select box is disabled
+     *  @param	int		$minimumInputLength		Minimum Input Length
+     *  @param	string	$morecss				Add more class to css styles
+     *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
+     *  @param  string  $placeholder            String to use as placeholder
+     *  @param  integer $acceptdelayedhtml      1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+     * 	@return	string   						HTML select string
+     *  @see selectArrayAjax, ajax_combobox in ajax.lib.php
+     */
+    static function selectArrayFilter($htmlname, $array, $id='', $moreparam='', $disableFiltering=0, $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
+    {
+        global $conf, $langs;
+        global $delayedhtmlcontent;
+
+        // TODO Use an internal dolibarr component instead of select2
+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+
+        $out='<select type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'"><option></option></select>';
+
+        $formattedarrayresult = array();
+
+        foreach($array as $key => $value) {
+            $o = new stdClass();
+            $o->id = $key;
+            $o->text = $value['text'];
+            $o->url = $value['url'];
+            $formattedarrayresult[] = $o;
+        }
+
+        $tmpplugin='select2';
+        $outdelayed="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 			<script type="text/javascript">
 			$(document).ready(function () {
 				var data = '.json_encode($formattedarrayresult).';
@@ -5984,31 +5984,31 @@ 
 
 						if(! data.id) return null;';
 
-		if($callurlonselect) {
-			$outdelayed.='
+        if($callurlonselect) {
+            $outdelayed.='
 
 						var urlBase = data.url;
 						var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";
 						/* console.log("params.term="+params.term); */
 						/* console.log("params.term encoded="+encodeURIComponent(params.term)); */
 						saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term);';
-		}
+        }
 
-		if(! $disableFiltering) {
-			$outdelayed.='
+        if(! $disableFiltering) {
+            $outdelayed.='
 
 						if(data.text.match(new RegExp(params.term))) {
 							return data;
 						}
 
 						return null;';
-		} else {
-			$outdelayed.='
+        } else {
+            $outdelayed.='
 
 						return data;';
-		}
+        }
 
-		$outdelayed.='
+        $outdelayed.='
 					}
 				});
 
@@ -6031,73 +6031,73 @@ 
 			});
 			</script>';
 
-		if ($acceptdelayedhtml)
-		{
-			$delayedhtmlcontent.=$outdelayed;
-		}
-		else
-		{
-			$out.=$outdelayed;
-		}
-		return $out;
-	}
-
-	/**
-	 *	Show a multiselect form from an array.
-	 *
-	 *	@param	string	$htmlname		Name of select
-	 *	@param	array	$array			Array with key+value
-	 *	@param	array	$selected		Array with key+value preselected
-	 *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"
-	 *	@param	int		$value_as_key   1 to use value as key
-	 *	@param  string	$morecss        Add more css style
-	 *	@param  int		$translate		Translate and encode value
-	 *  @param	int		$width			Force width of select box. May be used only when using jquery couch. Example: 250, 95%
-	 *  @param	string	$moreattrib		Add more options on select component. Example: 'disabled'
-	 *  @param	string	$elemtype		Type of element we show ('category', ...)
-	 *  @param	string	$placeholder	String to use as placeholder
-	 *  @param	int		$addjscombo		Add js combo
-	 *	@return	string					HTML multiselect string
-	 *  @see selectarray
-	 */
-	static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='', $elemtype='', $placeholder='', $addjscombo=1)
-	{
-		global $conf, $langs;
-
-		$out = '';
-
-
-		// Add code for jquery to use multiselect
-		if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
-		{
-			$out.="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+        if ($acceptdelayedhtml)
+        {
+            $delayedhtmlcontent.=$outdelayed;
+        }
+        else
+        {
+            $out.=$outdelayed;
+        }
+        return $out;
+    }
+
+    /**
+     *	Show a multiselect form from an array.
+     *
+     *	@param	string	$htmlname		Name of select
+     *	@param	array	$array			Array with key+value
+     *	@param	array	$selected		Array with key+value preselected
+     *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"
+     *	@param	int		$value_as_key   1 to use value as key
+     *	@param  string	$morecss        Add more css style
+     *	@param  int		$translate		Translate and encode value
+     *  @param	int		$width			Force width of select box. May be used only when using jquery couch. Example: 250, 95%
+     *  @param	string	$moreattrib		Add more options on select component. Example: 'disabled'
+     *  @param	string	$elemtype		Type of element we show ('category', ...)
+     *  @param	string	$placeholder	String to use as placeholder
+     *  @param	int		$addjscombo		Add js combo
+     *	@return	string					HTML multiselect string
+     *  @see selectarray
+     */
+    static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='', $elemtype='', $placeholder='', $addjscombo=1)
+    {
+        global $conf, $langs;
+
+        $out = '';
+
+
+        // Add code for jquery to use multiselect
+        if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
+        {
+            $out.="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 						<script type="text/javascript">'."\n";
-			if ($addjscombo == 1)
-			{
-				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				$out.=	'function formatResult(record) {'."\n";
-				if ($elemtype == 'category')
-				{
-					$out.='	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';
+            if ($addjscombo == 1)
+            {
+                $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+                $out.=	'function formatResult(record) {'."\n";
+                if ($elemtype == 'category')
+                {
+                    $out.='	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';
 									  	return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
-					$out.='return record.text;';
-				}
-				$out.=	'};'."\n";
-				$out.=	'function formatSelection(record) {'."\n";
-				if ($elemtype == 'category')
-				{
-					$out.='	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';
+                }
+                else
+                {
+                    $out.='return record.text;';
+                }
+                $out.=	'};'."\n";
+                $out.=	'function formatSelection(record) {'."\n";
+                if ($elemtype == 'category')
+                {
+                    $out.='	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';
 									  	return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
-					$out.='return record.text;';
-				}
-				$out.=	'};'."\n";
-				$out.=	'$(document).ready(function () {
+                }
+                else
+                {
+                    $out.='return record.text;';
+                }
+                $out.=	'};'."\n";
+                $out.=	'$(document).ready(function () {
 							$(\'#'.$htmlname.'\').'.$tmpplugin.'({
 								dir: \'ltr\',
 								// Specify format function for dropdown item
@@ -6108,12 +6108,12 @@ 
 							 	templateResult: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			}
-			elseif ($addjscombo == 2)
-			{
-				// Add other js lib
-				// ...
-				$out.= '$(document).ready(function () {
+            }
+            elseif ($addjscombo == 2)
+            {
+                // Add other js lib
+                // ...
+                $out.= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
 								menuHTML: \'<div class="multi-select-menu">\',
@@ -6123,91 +6123,91 @@ 
 								noneText: \''.$placeholder.'\'
 							});
 						})';
-			}
-			$out.=	'</script>';
-		}
-
-		// Try also magic suggest
-
-		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss?' '.$morecss:'').'" multiple name="'.$htmlname.'[]"'.($moreattrib?' '.$moreattrib:'').($width?' style="width: '.(preg_match('/%/',$width)?$width:$width.'px').'"':'').'>'."\n";
-		if (is_array($array) && ! empty($array))
-		{
-			if ($value_as_key) $array=array_combine($array, $array);
-
-			if (! empty($array))
-			{
-				foreach ($array as $key => $value)
-				{
-					$out.= '<option value="'.$key.'"';
-					if (is_array($selected) && ! empty($selected) && in_array($key, $selected) && !empty($key))
-					{
-						$out.= ' selected';
-					}
-					$out.= '>';
-
-					$newval = ($translate ? $langs->trans($value) : $value);
-					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
-					$out.= dol_htmlentitiesbr($newval);
-					$out.= '</option>'."\n";
-				}
-			}
-		}
-		$out.= '</select>'."\n";
-
-		return $out;
-	}
-
-
-	/**
-	 *	Show a multiselect dropbox from an array.
-	 *
-	 *	@param	string	$htmlname		Name of HTML field
-	 *	@param	array	$array			Array with array of fields we could show. This array may be modified according to setup of user.
-	 *  @param  string  $varpage        Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
-	 *	@return	string					HTML multiselect string
-	 *  @see selectarray
-	 */
-	static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage)
-	{
-		global $conf,$langs,$user;
-
-		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
-
-		$tmpvar="MAIN_SELECTEDFIELDS_".$varpage;
-		if (! empty($user->conf->$tmpvar))
-		{
-			$tmparray=explode(',', $user->conf->$tmpvar);
-			foreach($array as $key => $val)
-			{
-				//var_dump($key);
-				//var_dump($tmparray);
-				if (in_array($key, $tmparray)) $array[$key]['checked']=1;
-				else $array[$key]['checked']=0;
-			}
-		}
-		//var_dump($array);
-
-		$lis='';
-		$listcheckedstring='';
-
-		foreach($array as $key => $val)
-		{
-		   /* var_dump($val);
+            }
+            $out.=	'</script>';
+        }
+
+        // Try also magic suggest
+
+        $out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss?' '.$morecss:'').'" multiple name="'.$htmlname.'[]"'.($moreattrib?' '.$moreattrib:'').($width?' style="width: '.(preg_match('/%/',$width)?$width:$width.'px').'"':'').'>'."\n";
+        if (is_array($array) && ! empty($array))
+        {
+            if ($value_as_key) $array=array_combine($array, $array);
+
+            if (! empty($array))
+            {
+                foreach ($array as $key => $value)
+                {
+                    $out.= '<option value="'.$key.'"';
+                    if (is_array($selected) && ! empty($selected) && in_array($key, $selected) && !empty($key))
+                    {
+                        $out.= ' selected';
+                    }
+                    $out.= '>';
+
+                    $newval = ($translate ? $langs->trans($value) : $value);
+                    $newval = ($key_in_label ? $key.' - '.$newval : $newval);
+                    $out.= dol_htmlentitiesbr($newval);
+                    $out.= '</option>'."\n";
+                }
+            }
+        }
+        $out.= '</select>'."\n";
+
+        return $out;
+    }
+
+
+    /**
+     *	Show a multiselect dropbox from an array.
+     *
+     *	@param	string	$htmlname		Name of HTML field
+     *	@param	array	$array			Array with array of fields we could show. This array may be modified according to setup of user.
+     *  @param  string  $varpage        Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
+     *	@return	string					HTML multiselect string
+     *  @see selectarray
+     */
+    static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage)
+    {
+        global $conf,$langs,$user;
+
+        if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+
+        $tmpvar="MAIN_SELECTEDFIELDS_".$varpage;
+        if (! empty($user->conf->$tmpvar))
+        {
+            $tmparray=explode(',', $user->conf->$tmpvar);
+            foreach($array as $key => $val)
+            {
+                //var_dump($key);
+                //var_dump($tmparray);
+                if (in_array($key, $tmparray)) $array[$key]['checked']=1;
+                else $array[$key]['checked']=0;
+            }
+        }
+        //var_dump($array);
+
+        $lis='';
+        $listcheckedstring='';
+
+        foreach($array as $key => $val)
+        {
+            /* var_dump($val);
             var_dump(array_key_exists('enabled', $val));
             var_dump(!$val['enabled']);*/
-		   if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled'])
-		   {
-			   unset($array[$key]);     // We don't want this field
-			   continue;
-		   }
-		   if ($val['label'])
-		   {
-		   	$lis.='<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked'])?'':' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
-			   $listcheckedstring.=(empty($val['checked'])?'':$key.',');
-		   }
-		}
-
-		$out ='<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->
+            if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled'])
+            {
+                unset($array[$key]);     // We don't want this field
+                continue;
+            }
+            if ($val['label'])
+            {
+                $lis.='<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked'])?'':' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
+                $listcheckedstring.=(empty($val['checked'])?'':$key.',');
+            }
+        }
+
+        $out ='<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->
 
         <dl class="dropdown">
             <dt>
@@ -6225,355 +6225,355 @@ 
             </dd>
         </dl>
 
-        <script type="text/javascript">
-          jQuery(document).ready(function () {
-              $(\'.multiselectcheckbox'.$htmlname.' input[type="checkbox"]\').on(\'click\', function () {
-                  console.log("A new field was added/removed")
-                  $("input:hidden[name=formfilteraction]").val(\'listafterchangingselectedfields\')
-                  var title = $(this).val() + ",";
-                  if ($(this).is(\':checked\')) {
-                      $(\'.'.$htmlname.'\').val(title + $(\'.'.$htmlname.'\').val());
-                  }
-                  else {
-                      $(\'.'.$htmlname.'\').val( $(\'.'.$htmlname.'\').val().replace(title, \'\') )
-                  }
-                  // Now, we submit page
-                  $(this).parents(\'form:first\').submit();
-              });
-           });
-        </script>
+        <script type="text/javascript">
+          jQuery(document).ready(function () {
+              $(\'.multiselectcheckbox'.$htmlname.' input[type="checkbox"]\').on(\'click\', function () {
+                  console.log("A new field was added/removed")
+                  $("input:hidden[name=formfilteraction]").val(\'listafterchangingselectedfields\')
+                  var title = $(this).val() + ",";
+                  if ($(this).is(\':checked\')) {
+                      $(\'.'.$htmlname.'\').val(title + $(\'.'.$htmlname.'\').val());
+                  }
+                  else {
+                      $(\'.'.$htmlname.'\').val( $(\'.'.$htmlname.'\').val().replace(title, \'\') )
+                  }
+                  // Now, we submit page
+                  $(this).parents(\'form:first\').submit();
+              });
+           });
+        </script>
+
+        ';
+        return $out;
+    }
+
+    /**
+     * 	Render list of categories linked to object with id $id and type $type
+     *
+     * 	@param		int		$id				Id of object
+     * 	@param		string	$type			Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
+     *  @param		int		$rendermode		0=Default, use multiselect. 1=Emulate multiselect (recommended)
+     * 	@return		string					String with categories
+     */
+    function showCategories($id, $type, $rendermode=0)
+    {
+        global $db;
+
+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+        $cat = new Categorie($db);
+        $categories = $cat->containing($id, $type);
+
+        if ($rendermode == 1)
+        {
+            $toprint = array();
+            foreach($categories as $c)
+            {
+                $ways = $c->print_all_ways();       // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+                foreach($ways as $way)
+                {
+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color?' style="background: #'.$c->color.';"':' style="background: #aaa"').'>'.img_object('','category').' '.$way.'</li>';
+                }
+            }
+            return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+        }
+
+        if ($rendermode == 0)
+        {
+            $cate_arbo = $this->select_all_categories($type, '', 'parent', 64, 0, 1);
+            foreach($categories as $c) {
+                $arrayselected[] = $c->id;
+            }
+
+            return $this->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%', 'disabled', 'category');
+        }
+
+        return 'ErrorBadValueForParameterRenderMode';	// Should not happened
+    }
+
+
+    /**
+     *  Show linked object block.
+     *
+     *  @param	CommonObject	$object		      Object we want to show links to
+     *  @param  string          $morehtmlright    More html to show on right of title
+     *  @param  array           $compatibleImportElementsList  Array of compatibles elements object for "import from" action
+     *  @return	int							      <0 if KO, >=0 if OK
+     */
+    function showLinkedObjectBlock($object, $morehtmlright='',$compatibleImportElementsList=false)
+    {
+        global $conf,$langs,$hookmanager;
+        global $bc;
+
+        $object->fetchObjectLinked();
+
+        // Bypass the default method
+        $hookmanager->initHooks(array('commonobject'));
+        $parameters=array(
+            'morehtmlright' => $morehtmlright,
+            'compatibleImportElementsList' =>& $compatibleImportElementsList,
+        );
+        $reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+        if (empty($reshook))
+        {
+            $nbofdifferenttypes = count($object->linkedObjects);
+
+            print '<!-- showLinkedObjectBlock -->';
+            print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');
+
+
+            print '<div class="div-table-responsive-no-min">';
+            print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="'.$object->element.'"  data-elementid="'.$object->id.'"   >';
+
+            print '<tr class="liste_titre">';
+            print '<td>'.$langs->trans("Type").'</td>';
+            print '<td>'.$langs->trans("Ref").'</td>';
+            print '<td align="center"></td>';
+            print '<td align="center">'.$langs->trans("Date").'</td>';
+            print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';
+            print '<td align="right">'.$langs->trans("Status").'</td>';
+            print '<td></td>';
+            print '</tr>';
+
+            $nboftypesoutput=0;
+
+            foreach($object->linkedObjects as $objecttype => $objects)
+            {
+                $tplpath = $element = $subelement = $objecttype;
+
+                // to display inport button on tpl
+                $showImportButton=false;
+                if(!empty($compatibleImportElementsList) && in_array($element,$compatibleImportElementsList)){
+                    $showImportButton=true;
+                }
+
+                if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+                {
+                    $element = $regs[1];
+                    $subelement = $regs[2];
+                    $tplpath = $element.'/'.$subelement;
+                }
+                $tplname='linkedobjectblock';
+
+                // To work with non standard path
+                if ($objecttype == 'facture')          {
+                    $tplpath = 'compta/'.$element;
+                    if (empty($conf->facture->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'facturerec')          {
+                    $tplpath = 'compta/facture';
+                    $tplname = 'linkedobjectblockForRec';
+                    if (empty($conf->facture->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'propal')           {
+                    $tplpath = 'comm/'.$element;
+                    if (empty($conf->propal->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'supplier_proposal')           {
+                    if (empty($conf->supplier_proposal->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'shipping' || $objecttype == 'shipment') {
+                    $tplpath = 'expedition';
+                    if (empty($conf->expedition->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'reception') {
+                    $tplpath = 'reception';
+                    if (empty($conf->reception->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'delivery')         {
+                    $tplpath = 'livraison';
+                    if (empty($conf->expedition->enabled)) continue;	// Do not show if module disabled
+                }
+                else if ($objecttype == 'invoice_supplier') {
+                    $tplpath = 'fourn/facture';
+                }
+                else if ($objecttype == 'order_supplier')   {
+                    $tplpath = 'fourn/commande';
+                }
+                else if ($objecttype == 'expensereport')   {
+                    $tplpath = 'expensereport';
+                }
+                else if ($objecttype == 'subscription')   {
+                    $tplpath = 'adherents';
+                }
+
+                global $linkedObjectBlock;
+                $linkedObjectBlock = $objects;
+
+
+                // Output template part (modules that overwrite templates must declare this into descriptor)
+                $dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl'));
+                foreach($dirtpls as $reldir)
+                {
+                    if ($nboftypesoutput == ($nbofdifferenttypes - 1))    // No more type to show after
+                    {
+                        global $noMoreLinkedObjectBlockAfter;
+                        $noMoreLinkedObjectBlockAfter=1;
+                    }
+
+                    $res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
+                    if ($res)
+                    {
+                        $nboftypesoutput++;
+                        break;
+                    }
+                }
+            }
+
+            if (! $nboftypesoutput)
+            {
+                print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
+            }
+
+            print '</table>';
+
+            if(!empty($compatibleImportElementsList))
+            {
+                $res=@include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
+            }
+
+
+            print '</div>';
+
+            return $nbofdifferenttypes;
+        }
+    }
+
+    /**
+     *  Show block with links to link to other objects.
+     *
+     *  @param	CommonObject	$object				Object we want to show links to
+     *  @param	array			$restrictlinksto	Restrict links to some elements, for exemple array('order') or array('supplier_order'). null or array() if no restriction.
+     *  @param	array			$excludelinksto		Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion.
+     *  @return	string								<0 if KO, >0 if OK
+     */
+    function showLinkToObjectBlock($object, $restrictlinksto=array(), $excludelinksto=array())
+    {
+        global $conf, $langs, $hookmanager;
+        global $bc;
+
+        $linktoelem='';
+        $linktoelemlist='';
+        $listofidcompanytoscan='';
+
+        if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
+
+        $possiblelinks=array();
+        if (is_object($object->thirdparty) && ! empty($object->thirdparty->id) && $object->thirdparty->id > 0)
+        {
+            $listofidcompanytoscan=$object->thirdparty->id;
+            if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
+            if (($object->fk_project > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $tmpproject=new Project($this->db);
+                $tmpproject->fetch($object->fk_project);
+                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) $listofidcompanytoscan.=','.$tmpproject->socid;
+                unset($tmpproject);
+            }
+
+            $possiblelinks=array(
+                'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),
+                'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),
+                'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),
+                'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),
+                'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),
+                'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),
+                'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),
+                'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),
+                'invoice_supplier'=>array('enabled'=>$conf->supplier_invoice->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')
+            );
+        }
+
+        global $action;
 
-        ';
-		return $out;
-	}
-
-	/**
-	 * 	Render list of categories linked to object with id $id and type $type
-	 *
-	 * 	@param		int		$id				Id of object
-	 * 	@param		string	$type			Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
-	 *  @param		int		$rendermode		0=Default, use multiselect. 1=Emulate multiselect (recommended)
-	 * 	@return		string					String with categories
-	 */
-	function showCategories($id, $type, $rendermode=0)
-	{
-		global $db;
-
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-		$cat = new Categorie($db);
-		$categories = $cat->containing($id, $type);
-
-		if ($rendermode == 1)
-		{
-			$toprint = array();
-			foreach($categories as $c)
-			{
-				$ways = $c->print_all_ways();       // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
-				foreach($ways as $way)
-				{
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color?' style="background: #'.$c->color.';"':' style="background: #aaa"').'>'.img_object('','category').' '.$way.'</li>';
-				}
-			}
-			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-
-		if ($rendermode == 0)
-		{
-			$cate_arbo = $this->select_all_categories($type, '', 'parent', 64, 0, 1);
-			foreach($categories as $c) {
-				$arrayselected[] = $c->id;
-			}
-
-			return $this->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%', 'disabled', 'category');
-		}
-
-		return 'ErrorBadValueForParameterRenderMode';	// Should not happened
-	}
-
-
-	/**
-	 *  Show linked object block.
-	 *
-	 *  @param	CommonObject	$object		      Object we want to show links to
-	 *  @param  string          $morehtmlright    More html to show on right of title
-	 *  @param  array           $compatibleImportElementsList  Array of compatibles elements object for "import from" action
-	 *  @return	int							      <0 if KO, >=0 if OK
-	 */
-	function showLinkedObjectBlock($object, $morehtmlright='',$compatibleImportElementsList=false)
-	{
-		global $conf,$langs,$hookmanager;
-		global $bc;
-
-		$object->fetchObjectLinked();
-
-		// Bypass the default method
-		$hookmanager->initHooks(array('commonobject'));
-		$parameters=array(
-			'morehtmlright' => $morehtmlright,
-		    'compatibleImportElementsList' =>& $compatibleImportElementsList,
-		);
-		$reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-		if (empty($reshook))
-		{
-			$nbofdifferenttypes = count($object->linkedObjects);
-
-			print '<!-- showLinkedObjectBlock -->';
-			print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');
-
-
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="'.$object->element.'"  data-elementid="'.$object->id.'"   >';
-
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("Type").'</td>';
-			print '<td>'.$langs->trans("Ref").'</td>';
-			print '<td align="center"></td>';
-			print '<td align="center">'.$langs->trans("Date").'</td>';
-			print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';
-			print '<td align="right">'.$langs->trans("Status").'</td>';
-			print '<td></td>';
-			print '</tr>';
-
-			$nboftypesoutput=0;
-
-			foreach($object->linkedObjects as $objecttype => $objects)
-			{
-				$tplpath = $element = $subelement = $objecttype;
-
-				// to display inport button on tpl
-				$showImportButton=false;
-				if(!empty($compatibleImportElementsList) && in_array($element,$compatibleImportElementsList)){
-				    $showImportButton=true;
-				}
-
-				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
-				{
-					$element = $regs[1];
-					$subelement = $regs[2];
-					$tplpath = $element.'/'.$subelement;
-				}
-				$tplname='linkedobjectblock';
-
-				// To work with non standard path
-				if ($objecttype == 'facture')          {
-					$tplpath = 'compta/'.$element;
-					if (empty($conf->facture->enabled)) continue;	// Do not show if module disabled
-				}
-				else if ($objecttype == 'facturerec')          {
-					$tplpath = 'compta/facture';
-					$tplname = 'linkedobjectblockForRec';
-					if (empty($conf->facture->enabled)) continue;	// Do not show if module disabled
-				}
-				else if ($objecttype == 'propal')           {
-					$tplpath = 'comm/'.$element;
-					if (empty($conf->propal->enabled)) continue;	// Do not show if module disabled
-				}
-				else if ($objecttype == 'supplier_proposal')           {
-					if (empty($conf->supplier_proposal->enabled)) continue;	// Do not show if module disabled
-				}
-				else if ($objecttype == 'shipping' || $objecttype == 'shipment') {
-					$tplpath = 'expedition';
-					if (empty($conf->expedition->enabled)) continue;	// Do not show if module disabled
-				}
-        		else if ($objecttype == 'reception') {
-        			$tplpath = 'reception';
-        			if (empty($conf->reception->enabled)) continue;	// Do not show if module disabled
-        		}
-				else if ($objecttype == 'delivery')         {
-					$tplpath = 'livraison';
-					if (empty($conf->expedition->enabled)) continue;	// Do not show if module disabled
-				}
-				else if ($objecttype == 'invoice_supplier') {
-					$tplpath = 'fourn/facture';
-				}
-				else if ($objecttype == 'order_supplier')   {
-					$tplpath = 'fourn/commande';
-				}
-				else if ($objecttype == 'expensereport')   {
-					$tplpath = 'expensereport';
-				}
-				else if ($objecttype == 'subscription')   {
-					$tplpath = 'adherents';
-				}
-
-				global $linkedObjectBlock;
-				$linkedObjectBlock = $objects;
-
-
-				// Output template part (modules that overwrite templates must declare this into descriptor)
-				$dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl'));
-				foreach($dirtpls as $reldir)
-				{
-					if ($nboftypesoutput == ($nbofdifferenttypes - 1))    // No more type to show after
-					{
-						global $noMoreLinkedObjectBlockAfter;
-						$noMoreLinkedObjectBlockAfter=1;
-					}
+        // Can complete the possiblelink array
+        $hookmanager->initHooks(array('commonobject'));
+        $parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
+        $reshook=$hookmanager->executeHooks('showLinkToObjectBlock',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        if (empty($reshook))
+        {
+            if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
+            {
+                $possiblelinks=array_merge($possiblelinks, $hookmanager->resArray);
+            }
+        }
+        else if ($reshook > 0)
+        {
+            if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
+            {
+                $possiblelinks=$hookmanager->resArray;
+            }
+        }
 
-					$res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
-					if ($res)
-					{
-						$nboftypesoutput++;
-						break;
-					}
-				}
-			}
-
-			if (! $nboftypesoutput)
-			{
-				print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
-			}
-
-			print '</table>';
-
-			if(!empty($compatibleImportElementsList))
-			{
-			    $res=@include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
-			}
-
-
-			print '</div>';
-
-			return $nbofdifferenttypes;
-		}
-	}
-
-	/**
-	 *  Show block with links to link to other objects.
-	 *
-	 *  @param	CommonObject	$object				Object we want to show links to
-	 *  @param	array			$restrictlinksto	Restrict links to some elements, for exemple array('order') or array('supplier_order'). null or array() if no restriction.
-	 *  @param	array			$excludelinksto		Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion.
-	 *  @return	string								<0 if KO, >0 if OK
-	 */
-	function showLinkToObjectBlock($object, $restrictlinksto=array(), $excludelinksto=array())
-	{
-		global $conf, $langs, $hookmanager;
-		global $bc;
-
-		$linktoelem='';
-		$linktoelemlist='';
-		$listofidcompanytoscan='';
-
-		if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
-
-		$possiblelinks=array();
-		if (is_object($object->thirdparty) && ! empty($object->thirdparty->id) && $object->thirdparty->id > 0)
-		{
-			$listofidcompanytoscan=$object->thirdparty->id;
-			if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
-			if (($object->fk_project > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$tmpproject=new Project($this->db);
-				$tmpproject->fetch($object->fk_project);
-				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) $listofidcompanytoscan.=','.$tmpproject->socid;
-				unset($tmpproject);
-			}
-
-			$possiblelinks=array(
-				'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),
-				'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),
-				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),
-				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),
-				'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),
-				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),
-				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),
-				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),
-				'invoice_supplier'=>array('enabled'=>$conf->supplier_invoice->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')
-			);
-		}
-
-		global $action;
-
-		// Can complete the possiblelink array
-		$hookmanager->initHooks(array('commonobject'));
-		$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
-		$reshook=$hookmanager->executeHooks('showLinkToObjectBlock',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
-			{
-				$possiblelinks=array_merge($possiblelinks, $hookmanager->resArray);
-			}
-		}
-		else if ($reshook > 0)
-		{
-			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
-			{
-				$possiblelinks=$hookmanager->resArray;
-			}
-		}
-
-		foreach($possiblelinks as $key => $possiblelink)
-		{
-			$num = 0;
-
-			if (empty($possiblelink['enabled'])) continue;
-
-			if (! empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || ! in_array($key, $excludelinksto)))
-			{
-				print '<div id="'.$key.'list"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?' style="display:none"':'').'>';
-				$sql = $possiblelink['sql'];
-
-				$resqllist = $this->db->query($sql);
-				if ($resqllist)
-				{
-					$num = $this->db->num_rows($resqllist);
-					$i = 0;
-
-					print '<br><form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formlinked'.$key.'">';
-					print '<input type="hidden" name="id" value="'.$object->id.'">';
-					print '<input type="hidden" name="action" value="addlink">';
-					print '<input type="hidden" name="addlink" value="'.$key.'">';
-					print '<table class="noborder">';
-					print '<tr class="liste_titre">';
-					print '<td class="nowrap"></td>';
-					print '<td align="center">' . $langs->trans("Ref") . '</td>';
-					print '<td align="left">' . $langs->trans("RefCustomer") . '</td>';
-					print '<td align="right">' . $langs->trans("AmountHTShort") . '</td>';
-					print '<td align="left">' . $langs->trans("Company") . '</td>';
-					print '</tr>';
-					while ($i < $num)
-					{
-						$objp = $this->db->fetch_object($resqllist);
-
-						print '<tr class="oddeven">';
-						print '<td aling="left">';
-						print '<input type="radio" name="idtolinkto" value=' . $objp->rowid . '>';
-						print '</td>';
-						print '<td align="center">' . $objp->ref . '</td>';
-						print '<td>' . $objp->ref_client . '</td>';
-						print '<td align="right">' . price($objp->total_ht) . '</td>';
-						print '<td>' . $objp->name . '</td>';
-						print '</tr>';
-						$i++;
-					}
-					print '</table>';
-					print '<div class="center"><input type="submit" class="button valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>';
-
-					print '</form>';
-					$this->db->free($resqllist);
-				} else {
-					dol_print_error($this->db);
-				}
-				print '</div>';
-				if ($num > 0)
-				{
-				}
-
-				//$linktoelem.=($linktoelem?' &nbsp; ':'');
-				if ($num > 0) $linktoelemlist.='<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">' . $langs->trans($possiblelink['label']) .' ('.$num.')</a></li>';
-				//else $linktoelem.=$langs->trans($possiblelink['label']);
-				else $linktoelemlist.='<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';
-			}
-		}
-
-		if ($linktoelemlist)
-		{
-			$linktoelem='
+        foreach($possiblelinks as $key => $possiblelink)
+        {
+            $num = 0;
+
+            if (empty($possiblelink['enabled'])) continue;
+
+            if (! empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || ! in_array($key, $excludelinksto)))
+            {
+                print '<div id="'.$key.'list"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?' style="display:none"':'').'>';
+                $sql = $possiblelink['sql'];
+
+                $resqllist = $this->db->query($sql);
+                if ($resqllist)
+                {
+                    $num = $this->db->num_rows($resqllist);
+                    $i = 0;
+
+                    print '<br><form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formlinked'.$key.'">';
+                    print '<input type="hidden" name="id" value="'.$object->id.'">';
+                    print '<input type="hidden" name="action" value="addlink">';
+                    print '<input type="hidden" name="addlink" value="'.$key.'">';
+                    print '<table class="noborder">';
+                    print '<tr class="liste_titre">';
+                    print '<td class="nowrap"></td>';
+                    print '<td align="center">' . $langs->trans("Ref") . '</td>';
+                    print '<td align="left">' . $langs->trans("RefCustomer") . '</td>';
+                    print '<td align="right">' . $langs->trans("AmountHTShort") . '</td>';
+                    print '<td align="left">' . $langs->trans("Company") . '</td>';
+                    print '</tr>';
+                    while ($i < $num)
+                    {
+                        $objp = $this->db->fetch_object($resqllist);
+
+                        print '<tr class="oddeven">';
+                        print '<td aling="left">';
+                        print '<input type="radio" name="idtolinkto" value=' . $objp->rowid . '>';
+                        print '</td>';
+                        print '<td align="center">' . $objp->ref . '</td>';
+                        print '<td>' . $objp->ref_client . '</td>';
+                        print '<td align="right">' . price($objp->total_ht) . '</td>';
+                        print '<td>' . $objp->name . '</td>';
+                        print '</tr>';
+                        $i++;
+                    }
+                    print '</table>';
+                    print '<div class="center"><input type="submit" class="button valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>';
+
+                    print '</form>';
+                    $this->db->free($resqllist);
+                } else {
+                    dol_print_error($this->db);
+                }
+                print '</div>';
+                if ($num > 0)
+                {
+                }
+
+                //$linktoelem.=($linktoelem?' &nbsp; ':'');
+                if ($num > 0) $linktoelemlist.='<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">' . $langs->trans($possiblelink['label']) .' ('.$num.')</a></li>';
+                //else $linktoelem.=$langs->trans($possiblelink['label']);
+                else $linktoelemlist.='<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';
+            }
+        }
+
+        if ($linktoelemlist)
+        {
+            $linktoelem='
     		<dl class="dropdown" id="linktoobjectname">
     		<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>
     		<dd>
@@ -6583,13 +6583,13 @@ 
     		</div>
     		</dd>
     		</dl>';
-		}
-		else
-		{
-			$linktoelem='';
-		}
+        }
+        else
+        {
+            $linktoelem='';
+        }
 
-		print '<!-- Add js to show linkto box -->
+        print '<!-- Add js to show linkto box -->
 				<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery(".linkto").click(function() {
@@ -6601,584 +6601,584 @@ 
 				</script>
 		';
 
-		return $linktoelem;
-	}
-
-	/**
-	 *	Return an html string with a select combo box to choose yes or no
-	 *
-	 *	@param	string		$htmlname		Name of html select field
-	 *	@param	string		$value			Pre-selected value
-	 *	@param	int			$option			0 return yes/no, 1 return 1/0
-	 *	@param	bool		$disabled		true or false
-	 *  @param	int      	$useempty		1=Add empty line
-	 *	@return	string						See option
-	 */
-	function selectyesno($htmlname, $value='', $option=0, $disabled=false, $useempty=0)
-	{
-		global $langs;
-
-		$yes="yes"; $no="no";
-		if ($option)
-		{
-			$yes="1";
-			$no="0";
-		}
-
-		$disabled = ($disabled ? ' disabled' : '');
-
-		$resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
-		if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected':'').'>&nbsp;</option>'."\n";
-		if (("$value" == 'yes') || ($value == 1))
-		{
-			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
-			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
-		}
-		else
-	   {
-	   		$selected=(($useempty && $value != '0' && $value != 'no')?'':' selected');
-			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
-			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
-		}
-		$resultyesno .= '</select>'."\n";
-		return $resultyesno;
-	}
+        return $linktoelem;
+    }
+
+    /**
+     *	Return an html string with a select combo box to choose yes or no
+     *
+     *	@param	string		$htmlname		Name of html select field
+     *	@param	string		$value			Pre-selected value
+     *	@param	int			$option			0 return yes/no, 1 return 1/0
+     *	@param	bool		$disabled		true or false
+     *  @param	int      	$useempty		1=Add empty line
+     *	@return	string						See option
+     */
+    function selectyesno($htmlname, $value='', $option=0, $disabled=false, $useempty=0)
+    {
+        global $langs;
+
+        $yes="yes"; $no="no";
+        if ($option)
+        {
+            $yes="1";
+            $no="0";
+        }
+
+        $disabled = ($disabled ? ' disabled' : '');
+
+        $resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
+        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected':'').'>&nbsp;</option>'."\n";
+        if (("$value" == 'yes') || ($value == 1))
+        {
+            $resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
+            $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
+        }
+        else
+        {
+                $selected=(($useempty && $value != '0' && $value != 'no')?'':' selected');
+            $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
+            $resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
+        }
+        $resultyesno .= '</select>'."\n";
+        return $resultyesno;
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of export templates
-	 *
-	 *  @param	string	$selected          Id modele pre-selectionne
-	 *  @param  string	$htmlname          Name of HTML select
-	 *  @param  string	$type              Type of searched templates
-	 *  @param  int		$useempty          Affiche valeur vide dans liste
-	 *  @return	void
-	 */
-	function select_export_model($selected='',$htmlname='exportmodelid',$type='',$useempty=0)
-	{
+    /**
+     *  Return list of export templates
+     *
+     *  @param	string	$selected          Id modele pre-selectionne
+     *  @param  string	$htmlname          Name of HTML select
+     *  @param  string	$type              Type of searched templates
+     *  @param  int		$useempty          Affiche valeur vide dans liste
+     *  @return	void
+     */
+    function select_export_model($selected='',$htmlname='exportmodelid',$type='',$useempty=0)
+    {
         // phpcs:enable
-		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
-		$sql.= " WHERE type = '".$type."'";
-		$sql.= " ORDER BY rowid";
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($useempty)
-			{
-				print '<option value="-1">&nbsp;</option>';
-			}
-
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-				if ($selected == $obj->rowid)
-				{
-					print '<option value="'.$obj->rowid.'" selected>';
-				}
-				else
-				{
-					print '<option value="'.$obj->rowid.'">';
-				}
-				print $obj->label;
-				print '</option>';
-				$i++;
-			}
-			print "</select>";
-		}
-		else {
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 *    Return a HTML area with the reference of object and a navigation bar for a business object
-	 *    Note: To complete search with a particular filter on select, you can set $object->next_prev_filter set to define SQL criterias.
-	 *
-	 *    @param	object	$object			Object to show.
-	 *    @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link.
-	 *    @param	string	$morehtml  		More html content to output just before the nav bar.
-	 *    @param	int		$shownav	  	Show Condition (navigation is shown if value is 1).
-	 *    @param	string	$fieldid   		Name of field id into database to use for select next and previous (we make the select max and min on this field compared to $object->ref). Use 'none' to disable next/prev.
-	 *    @param	string	$fieldref   	Name of field ref of object (object->ref) to show or 'none' to not show ref.
-	 *    @param	string	$morehtmlref  	More html to show after ref.
-	 *    @param	string	$moreparam  	More param to add in nav link url. Must start with '&...'.
-	 *	  @param	int		$nodbprefix		Do not include DB prefix to forge table name.
-	 *	  @param	string	$morehtmlleft	More html code to show before ref.
-	 *	  @param	string	$morehtmlstatus	More html code to show under navigation arrows (status place).
-	 *	  @param	string	$morehtmlright	More html code to show after ref.
-	 * 	  @return	string    				Portion HTML with ref + navigation buttons
-	 */
-	function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0,$morehtmlleft='',$morehtmlstatus='',$morehtmlright='')
-	{
-		global $langs,$conf,$hookmanager;
-
-		$ret='';
-		if (empty($fieldid))  $fieldid='rowid';
-		if (empty($fieldref)) $fieldref='ref';
-
-		// Add where from hooks
-		if (is_object($hookmanager))
-		{
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters, $object);    // Note that $action and $object may have been modified by hook
-			$object->next_prev_filter.=$hookmanager->resPrint;
-		}
-		$previous_ref = $next_ref = '';
-		if ($shownav)
-		{
-			//print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
-			$object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''), $fieldid, $nodbprefix);
-
-			$navurl = $_SERVER["PHP_SELF"];
-			// Special case for project/task page
-			if ($paramid == 'project_ref')
-			{
-				$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/','/tasks.php',$navurl);
-				$paramid='ref';
-			}
-
-			// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
-			// accesskey is for Mac:               CTRL + key for all browsers
-			$stringforfirstkey = $langs->trans("KeyboardShortcut");
-			if ($conf->browser->name == 'chrome')
-			{
-				$stringforfirstkey .= ' ALT +';
-			}
-			elseif ($conf->browser->name == 'firefox')
-			{
-				$stringforfirstkey .= ' ALT + SHIFT +';
-			}
-			else
-			{
-				$stringforfirstkey .= ' CTL +';
-			}
-
-			$previous_ref = $object->ref_previous?'<a accesskey="p" title="'.$stringforfirstkey.' p" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'"><i class="fa fa-chevron-left"></i></a>':'<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';
-			$next_ref     = $object->ref_next?'<a accesskey="n" title="'.$stringforfirstkey.' n" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'"><i class="fa fa-chevron-right"></i></a>':'<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';
-		}
-
-		//print "xx".$previous_ref."x".$next_ref;
-		$ret.='<!-- Start banner content --><div style="vertical-align: middle">';
-
-		// Right part of banner
-		if ($morehtmlright) $ret.='<div class="inline-block floatleft">'.$morehtmlright.'</div>';
-
-		if ($previous_ref || $next_ref || $morehtml)
-		{
-			$ret.='<div class="pagination paginationref"><ul class="right">';
-		}
-		if ($morehtml)
-		{
-			$ret.='<li class="noborder litext">'.$morehtml.'</li>';
-		}
-		if ($shownav && ($previous_ref || $next_ref))
-		{
-			$ret.='<li class="pagination">'.$previous_ref.'</li>';
-			$ret.='<li class="pagination">'.$next_ref.'</li>';
-		}
-		if ($previous_ref || $next_ref || $morehtml)
-		{
-			$ret.='</ul></div>';
-		}
-
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('moreHtmlStatus',$parameters, $object);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $morehtmlstatus.=$hookmanager->resPrint;
-		else $morehtmlstatus=$hookmanager->resPrint;
-		if ($morehtmlstatus) $ret.='<div class="statusref">'.$morehtmlstatus.'</div>';
-
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $morehtmlref.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $morehtmlref=$hookmanager->resPrint;
-
-		// Left part of banner
-		if ($morehtmlleft)
-		{
-			if ($conf->browser->layout == 'phone') $ret.='<div class="floatleft">'.$morehtmlleft.'</div>';    // class="center" to have photo in middle
-			else $ret.='<div class="inline-block floatleft">'.$morehtmlleft.'</div>';
-		}
-
-		//if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';
-		$ret.='<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref))?' refidpadding':'').'">';
-
-		// For thirdparty, contact, user, member, the ref is the id, so we show something else
-		if ($object->element == 'societe')
-		{
-			$ret.=dol_htmlentities($object->name);
-		}
-		else if ($object->element == 'member')
-		{
-			$ret.=$object->ref.'<br>';
-			$fullname=$object->getFullName($langs);
-			if ($object->morphy == 'mor' && $object->societe) {
-				$ret.= dol_htmlentities($object->societe) . ((! empty($fullname) && $object->societe != $fullname)?' ('.dol_htmlentities($fullname).')':'');
-			} else {
-				$ret.= dol_htmlentities($fullname) . ((! empty($object->societe) && $object->societe != $fullname)?' ('.dol_htmlentities($object->societe).')':'');
-			}
-		}
-		else if (in_array($object->element, array('contact', 'user', 'usergroup')))
-		{
-			$ret.=dol_htmlentities($object->getFullName($langs));
-		}
-		else if (in_array($object->element, array('action', 'agenda')))
-		{
-			$ret.=$object->ref.'<br>'.$object->label;
-		}
-		else if (in_array($object->element, array('adherent_type')))
-		{
-			$ret.=$object->label;
-		}
-		else if ($object->element == 'ecm_directories')
-		{
-			$ret.='';
-		}
-		else if ($fieldref != 'none') $ret.=dol_htmlentities($object->$fieldref);
-
-
-		if ($morehtmlref)
-		{
-			$ret.=' '.$morehtmlref;
-		}
-		$ret.='</div>';
-
-		$ret.='</div><!-- End banner content -->';
-
-		return $ret;
-	}
-
-
-	/**
-	 *    	Return HTML code to output a barcode
-	 *
-	 *     	@param	Object	$object		Object containing data to retrieve file name
-	 * 		@param	int		$width			Width of photo
-	 * 	  	@return string    				HTML code to output barcode
-	 */
-	function showbarcode(&$object,$width=100)
-	{
-		global $conf;
-
-		//Check if barcode is filled in the card
-		if (empty($object->barcode)) return '';
-
-		// Complete object if not complete
-		if (empty($object->barcode_type_code) || empty($object->barcode_type_coder))
-		{
-			$result = $object->fetch_barcode();
-			//Check if fetch_barcode() failed
-			if ($result < 1) return '<!-- ErrorFetchBarcode -->';
-		}
-
-		// Barcode image
-		$url=DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code);
-		$out ='<!-- url barcode = '.$url.' -->';
-		$out.='<img src="'.$url.'">';
-		return $out;
-	}
-
-	/**
-	 *    	Return HTML code to output a photo
-	 *
-	 *    	@param	string		$modulepart			Key to define module concerned ('societe', 'userphoto', 'memberphoto')
-	 *     	@param  object		$object				Object containing data to retrieve file name
-	 * 		@param	int			$width				Width of photo
-	 * 		@param	int			$height				Height of photo (auto if 0)
-	 * 		@param	int			$caneditfield		Add edit fields
-	 * 		@param	string		$cssclass			CSS name to use on img for photo
-	 * 		@param	string		$imagesize		    'mini', 'small' or '' (original)
-	 *      @param  int         $addlinktofullsize  Add link to fullsize image
-	 *      @param  int         $cache              1=Accept to use image in cache
-	 *      @param	string		$forcecapture		Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty.
-	 * 	  	@return string    						HTML code to output photo
-	 */
-	static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1, $cache=0, $forcecapture='')
-	{
-		global $conf,$langs;
-
-		$entity = (! empty($object->entity) ? $object->entity : $conf->entity);
-		$id = (! empty($object->id) ? $object->id : $object->rowid);
-
-		$ret='';$dir='';$file='';$originalfile='';$altfile='';$email='';$capture='';
-		if ($modulepart=='societe')
-		{
-			$dir=$conf->societe->multidir_output[$entity];
-			if (! empty($object->logo))
-			{
-				if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini');             // getImageFileNameForSize include the thumbs
-				else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
-				else $file=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
-				$originalfile=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
-			}
-			$email=$object->email;
-		}
-		else if ($modulepart=='contact')
-		{
-			$dir=$conf->societe->multidir_output[$entity].'/contact';
-			if (! empty($object->photo))
-			{
-				if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
-				else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
-				$originalfile=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
-			}
-			$email=$object->email;
-			$capture='user';
-		}
-		else if ($modulepart=='userphoto')
-		{
-			$dir=$conf->user->dir_output;
-			if (! empty($object->photo))
-			{
-				if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
-				else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
-				else $file=get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
-				$originalfile=get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
-			}
-			if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
-			$email=$object->email;
-			$capture='user';
-		}
-		else if ($modulepart=='memberphoto')
-		{
-			$dir=$conf->adherent->dir_output;
-			if (! empty($object->photo))
-			{
-				if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
-				$originalfile=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
-			}
-			if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
-			$email=$object->email;
-			$capture='user';
-		}
-		else
-		{
-			// Generic case to show photos
-			$dir=$conf->$modulepart->dir_output;
-			if (! empty($object->photo))
-			{
-				if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
-				$originalfile=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
-			}
-			if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
-			$email=$object->email;
-		}
-
-		if ($forcecapture) $capture = $forcecapture;
-
-		if ($dir)
-		{
-			if ($file && file_exists($dir."/".$file))
-			{
-				if ($addlinktofullsize)
-				{
-					$urladvanced=getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
-					if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
-					else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
-				}
-				$ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
-				if ($addlinktofullsize) $ret.='</a>';
-			}
-			else if ($altfile && file_exists($dir."/".$altfile))
-			{
-				if ($addlinktofullsize)
-				{
-					$urladvanced=getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
-					if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
-					else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
-				}
-				$ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
-				if ($addlinktofullsize) $ret.='</a>';
-			}
-			else
-			{
-				$nophoto='/public/theme/common/nophoto.png';
-				if (in_array($modulepart,array('userphoto','contact')))	// For module that are "physical" users
-				{
-					$nophoto='/public/theme/common/user_anonymous.png';
-					if ($object->gender == 'man') $nophoto='/public/theme/common/user_man.png';
-					if ($object->gender == 'woman') $nophoto='/public/theme/common/user_woman.png';
-				}
-
-				if (! empty($conf->gravatar->enabled) && $email)
-				{
-					/**
-					 * @see https://gravatar.com/site/implement/images/php/
-					 */
-					global $dolibarr_main_url_root;
-					$ret.='<!-- Put link to gravatar -->';
-					//$defaultimg=urlencode(dol_buildpath($nophoto,3));
-					$defaultimg='mm';
-					$ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)),3).'?s='.$width.'&d='.$defaultimg.'">';	// gravatar need md5 hash
-				}
-				else
-				{
-					$ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
-				}
-			}
-
-			if ($caneditfield)
-			{
-				if ($object->photo) $ret.="<br>\n";
-				$ret.='<table class="nobordernopadding centpercent">';
-				if ($object->photo) $ret.='<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-				$ret.='<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"'.($capture?' capture="'.$capture.'"':'').'></td></tr>';
-				$ret.='</table>';
-			}
-		}
-		else dol_print_error('','Call of showphoto with wrong parameters modulepart='.$modulepart);
-
-		return $ret;
-	}
+        $sql = "SELECT rowid, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
+        $sql.= " WHERE type = '".$type."'";
+        $sql.= " ORDER BY rowid";
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+            if ($useempty)
+            {
+                print '<option value="-1">&nbsp;</option>';
+            }
+
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                if ($selected == $obj->rowid)
+                {
+                    print '<option value="'.$obj->rowid.'" selected>';
+                }
+                else
+                {
+                    print '<option value="'.$obj->rowid.'">';
+                }
+                print $obj->label;
+                print '</option>';
+                $i++;
+            }
+            print "</select>";
+        }
+        else {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *    Return a HTML area with the reference of object and a navigation bar for a business object
+     *    Note: To complete search with a particular filter on select, you can set $object->next_prev_filter set to define SQL criterias.
+     *
+     *    @param	object	$object			Object to show.
+     *    @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link.
+     *    @param	string	$morehtml  		More html content to output just before the nav bar.
+     *    @param	int		$shownav	  	Show Condition (navigation is shown if value is 1).
+     *    @param	string	$fieldid   		Name of field id into database to use for select next and previous (we make the select max and min on this field compared to $object->ref). Use 'none' to disable next/prev.
+     *    @param	string	$fieldref   	Name of field ref of object (object->ref) to show or 'none' to not show ref.
+     *    @param	string	$morehtmlref  	More html to show after ref.
+     *    @param	string	$moreparam  	More param to add in nav link url. Must start with '&...'.
+     *	  @param	int		$nodbprefix		Do not include DB prefix to forge table name.
+     *	  @param	string	$morehtmlleft	More html code to show before ref.
+     *	  @param	string	$morehtmlstatus	More html code to show under navigation arrows (status place).
+     *	  @param	string	$morehtmlright	More html code to show after ref.
+     * 	  @return	string    				Portion HTML with ref + navigation buttons
+     */
+    function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0,$morehtmlleft='',$morehtmlstatus='',$morehtmlright='')
+    {
+        global $langs,$conf,$hookmanager;
+
+        $ret='';
+        if (empty($fieldid))  $fieldid='rowid';
+        if (empty($fieldref)) $fieldref='ref';
+
+        // Add where from hooks
+        if (is_object($hookmanager))
+        {
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters, $object);    // Note that $action and $object may have been modified by hook
+            $object->next_prev_filter.=$hookmanager->resPrint;
+        }
+        $previous_ref = $next_ref = '';
+        if ($shownav)
+        {
+            //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
+            $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''), $fieldid, $nodbprefix);
+
+            $navurl = $_SERVER["PHP_SELF"];
+            // Special case for project/task page
+            if ($paramid == 'project_ref')
+            {
+                $navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/','/tasks.php',$navurl);
+                $paramid='ref';
+            }
+
+            // accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
+            // accesskey is for Mac:               CTRL + key for all browsers
+            $stringforfirstkey = $langs->trans("KeyboardShortcut");
+            if ($conf->browser->name == 'chrome')
+            {
+                $stringforfirstkey .= ' ALT +';
+            }
+            elseif ($conf->browser->name == 'firefox')
+            {
+                $stringforfirstkey .= ' ALT + SHIFT +';
+            }
+            else
+            {
+                $stringforfirstkey .= ' CTL +';
+            }
+
+            $previous_ref = $object->ref_previous?'<a accesskey="p" title="'.$stringforfirstkey.' p" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'"><i class="fa fa-chevron-left"></i></a>':'<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';
+            $next_ref     = $object->ref_next?'<a accesskey="n" title="'.$stringforfirstkey.' n" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'"><i class="fa fa-chevron-right"></i></a>':'<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';
+        }
+
+        //print "xx".$previous_ref."x".$next_ref;
+        $ret.='<!-- Start banner content --><div style="vertical-align: middle">';
+
+        // Right part of banner
+        if ($morehtmlright) $ret.='<div class="inline-block floatleft">'.$morehtmlright.'</div>';
+
+        if ($previous_ref || $next_ref || $morehtml)
+        {
+            $ret.='<div class="pagination paginationref"><ul class="right">';
+        }
+        if ($morehtml)
+        {
+            $ret.='<li class="noborder litext">'.$morehtml.'</li>';
+        }
+        if ($shownav && ($previous_ref || $next_ref))
+        {
+            $ret.='<li class="pagination">'.$previous_ref.'</li>';
+            $ret.='<li class="pagination">'.$next_ref.'</li>';
+        }
+        if ($previous_ref || $next_ref || $morehtml)
+        {
+            $ret.='</ul></div>';
+        }
+
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('moreHtmlStatus',$parameters, $object);    // Note that $action and $object may have been modified by hook
+        if (empty($reshook)) $morehtmlstatus.=$hookmanager->resPrint;
+        else $morehtmlstatus=$hookmanager->resPrint;
+        if ($morehtmlstatus) $ret.='<div class="statusref">'.$morehtmlstatus.'</div>';
+
+        $parameters = array();
+        $reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook
+        if (empty($reshook)) $morehtmlref.=$hookmanager->resPrint;
+        elseif ($reshook > 0) $morehtmlref=$hookmanager->resPrint;
+
+        // Left part of banner
+        if ($morehtmlleft)
+        {
+            if ($conf->browser->layout == 'phone') $ret.='<div class="floatleft">'.$morehtmlleft.'</div>';    // class="center" to have photo in middle
+            else $ret.='<div class="inline-block floatleft">'.$morehtmlleft.'</div>';
+        }
+
+        //if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';
+        $ret.='<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref))?' refidpadding':'').'">';
+
+        // For thirdparty, contact, user, member, the ref is the id, so we show something else
+        if ($object->element == 'societe')
+        {
+            $ret.=dol_htmlentities($object->name);
+        }
+        else if ($object->element == 'member')
+        {
+            $ret.=$object->ref.'<br>';
+            $fullname=$object->getFullName($langs);
+            if ($object->morphy == 'mor' && $object->societe) {
+                $ret.= dol_htmlentities($object->societe) . ((! empty($fullname) && $object->societe != $fullname)?' ('.dol_htmlentities($fullname).')':'');
+            } else {
+                $ret.= dol_htmlentities($fullname) . ((! empty($object->societe) && $object->societe != $fullname)?' ('.dol_htmlentities($object->societe).')':'');
+            }
+        }
+        else if (in_array($object->element, array('contact', 'user', 'usergroup')))
+        {
+            $ret.=dol_htmlentities($object->getFullName($langs));
+        }
+        else if (in_array($object->element, array('action', 'agenda')))
+        {
+            $ret.=$object->ref.'<br>'.$object->label;
+        }
+        else if (in_array($object->element, array('adherent_type')))
+        {
+            $ret.=$object->label;
+        }
+        else if ($object->element == 'ecm_directories')
+        {
+            $ret.='';
+        }
+        else if ($fieldref != 'none') $ret.=dol_htmlentities($object->$fieldref);
+
+
+        if ($morehtmlref)
+        {
+            $ret.=' '.$morehtmlref;
+        }
+        $ret.='</div>';
+
+        $ret.='</div><!-- End banner content -->';
+
+        return $ret;
+    }
+
+
+    /**
+     *    	Return HTML code to output a barcode
+     *
+     *     	@param	Object	$object		Object containing data to retrieve file name
+     * 		@param	int		$width			Width of photo
+     * 	  	@return string    				HTML code to output barcode
+     */
+    function showbarcode(&$object,$width=100)
+    {
+        global $conf;
+
+        //Check if barcode is filled in the card
+        if (empty($object->barcode)) return '';
+
+        // Complete object if not complete
+        if (empty($object->barcode_type_code) || empty($object->barcode_type_coder))
+        {
+            $result = $object->fetch_barcode();
+            //Check if fetch_barcode() failed
+            if ($result < 1) return '<!-- ErrorFetchBarcode -->';
+        }
+
+        // Barcode image
+        $url=DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code);
+        $out ='<!-- url barcode = '.$url.' -->';
+        $out.='<img src="'.$url.'">';
+        return $out;
+    }
+
+    /**
+     *    	Return HTML code to output a photo
+     *
+     *    	@param	string		$modulepart			Key to define module concerned ('societe', 'userphoto', 'memberphoto')
+     *     	@param  object		$object				Object containing data to retrieve file name
+     * 		@param	int			$width				Width of photo
+     * 		@param	int			$height				Height of photo (auto if 0)
+     * 		@param	int			$caneditfield		Add edit fields
+     * 		@param	string		$cssclass			CSS name to use on img for photo
+     * 		@param	string		$imagesize		    'mini', 'small' or '' (original)
+     *      @param  int         $addlinktofullsize  Add link to fullsize image
+     *      @param  int         $cache              1=Accept to use image in cache
+     *      @param	string		$forcecapture		Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty.
+     * 	  	@return string    						HTML code to output photo
+     */
+    static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1, $cache=0, $forcecapture='')
+    {
+        global $conf,$langs;
+
+        $entity = (! empty($object->entity) ? $object->entity : $conf->entity);
+        $id = (! empty($object->id) ? $object->id : $object->rowid);
+
+        $ret='';$dir='';$file='';$originalfile='';$altfile='';$email='';$capture='';
+        if ($modulepart=='societe')
+        {
+            $dir=$conf->societe->multidir_output[$entity];
+            if (! empty($object->logo))
+            {
+                if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini');             // getImageFileNameForSize include the thumbs
+                else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
+                else $file=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+                $originalfile=get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+            }
+            $email=$object->email;
+        }
+        else if ($modulepart=='contact')
+        {
+            $dir=$conf->societe->multidir_output[$entity].'/contact';
+            if (! empty($object->photo))
+            {
+                if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+                $originalfile=get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+            }
+            $email=$object->email;
+            $capture='user';
+        }
+        else if ($modulepart=='userphoto')
+        {
+            $dir=$conf->user->dir_output;
+            if (! empty($object->photo))
+            {
+                if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+                $originalfile=get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+            }
+            if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
+            $email=$object->email;
+            $capture='user';
+        }
+        else if ($modulepart=='memberphoto')
+        {
+            $dir=$conf->adherent->dir_output;
+            if (! empty($object->photo))
+            {
+                if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+                $originalfile=get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+            }
+            if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
+            $email=$object->email;
+            $capture='user';
+        }
+        else
+        {
+            // Generic case to show photos
+            $dir=$conf->$modulepart->dir_output;
+            if (! empty($object->photo))
+            {
+                if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
+                else $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+                $originalfile=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+            }
+            if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
+            $email=$object->email;
+        }
+
+        if ($forcecapture) $capture = $forcecapture;
+
+        if ($dir)
+        {
+            if ($file && file_exists($dir."/".$file))
+            {
+                if ($addlinktofullsize)
+                {
+                    $urladvanced=getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
+                    if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
+                    else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+                }
+                $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+                if ($addlinktofullsize) $ret.='</a>';
+            }
+            else if ($altfile && file_exists($dir."/".$altfile))
+            {
+                if ($addlinktofullsize)
+                {
+                    $urladvanced=getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
+                    if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
+                    else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+                }
+                $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
+                if ($addlinktofullsize) $ret.='</a>';
+            }
+            else
+            {
+                $nophoto='/public/theme/common/nophoto.png';
+                if (in_array($modulepart,array('userphoto','contact')))	// For module that are "physical" users
+                {
+                    $nophoto='/public/theme/common/user_anonymous.png';
+                    if ($object->gender == 'man') $nophoto='/public/theme/common/user_man.png';
+                    if ($object->gender == 'woman') $nophoto='/public/theme/common/user_woman.png';
+                }
+
+                if (! empty($conf->gravatar->enabled) && $email)
+                {
+                    /**
+                     * @see https://gravatar.com/site/implement/images/php/
+                     */
+                    global $dolibarr_main_url_root;
+                    $ret.='<!-- Put link to gravatar -->';
+                    //$defaultimg=urlencode(dol_buildpath($nophoto,3));
+                    $defaultimg='mm';
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)),3).'?s='.$width.'&d='.$defaultimg.'">';	// gravatar need md5 hash
+                }
+                else
+                {
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
+                }
+            }
+
+            if ($caneditfield)
+            {
+                if ($object->photo) $ret.="<br>\n";
+                $ret.='<table class="nobordernopadding centpercent">';
+                if ($object->photo) $ret.='<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                $ret.='<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"'.($capture?' capture="'.$capture.'"':'').'></td></tr>';
+                $ret.='</table>';
+            }
+        }
+        else dol_print_error('','Call of showphoto with wrong parameters modulepart='.$modulepart);
+
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return select list of groups
-	 *
-	 *  @param	string	$selected       Id group preselected
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
-	 *  @param  string	$exclude        Array list of groups id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  string	$include        Array list of groups id to include
-	 * 	@param	int		$enableonly		Array list of groups id to be enabled. All other must be disabled
-	 * 	@param	string	$force_entity	'0' or Ids of environment to force
-	 * 	@param	bool	$multiple		add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
-	 *  @return	string
-	 *  @see select_dolusers
-	 */
-	function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='0', $multiple=false)
-	{
+    /**
+     *	Return select list of groups
+     *
+     *  @param	string	$selected       Id group preselected
+     *  @param  string	$htmlname       Field name in form
+     *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
+     *  @param  string	$exclude        Array list of groups id to exclude
+     * 	@param	int		$disabled		If select list must be disabled
+     *  @param  string	$include        Array list of groups id to include
+     * 	@param	int		$enableonly		Array list of groups id to be enabled. All other must be disabled
+     * 	@param	string	$force_entity	'0' or Ids of environment to force
+     * 	@param	bool	$multiple		add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
+     *  @return	string
+     *  @see select_dolusers
+     */
+    function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='0', $multiple=false)
+    {
         // phpcs:enable
-		global $conf,$user,$langs;
-
-		// Permettre l'exclusion de groupes
-		if (is_array($exclude))	$excludeGroups = implode("','",$exclude);
-		// Permettre l'inclusion de groupes
-		if (is_array($include))	$includeGroups = implode("','",$include);
-
-		if (!is_array($selected)) $selected = array($selected);
-
-		$out='';
-
-		// On recherche les groupes
-		$sql = "SELECT ug.rowid, ug.nom as name";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		{
-			$sql.= ", e.label";
-		}
-		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
-			if ($force_entity) $sql.= " WHERE ug.entity IN (0,".$force_entity.")";
-			else $sql.= " WHERE ug.entity IS NOT NULL";
-		}
-		else
-		{
-			$sql.= " WHERE ug.entity IN (0,".$conf->entity.")";
-		}
-		if (is_array($exclude) && $excludeGroups) $sql.= " AND ug.rowid NOT IN ('".$excludeGroups."')";
-		if (is_array($include) && $includeGroups) $sql.= " AND ug.rowid IN ('".$includeGroups."')";
-		$sql.= " ORDER BY ug.nom ASC";
-
-		dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			// Enhance with select2
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-		   	$out .= ajax_combobox($htmlname);
-
-			$out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled?' disabled':'').'>';
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				if ($show_empty && !$multiple) $out.= '<option value="-1"'.(in_array(-1,$selected)?' selected':'').'>&nbsp;</option>'."\n";
-
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$disableline=0;
-					if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1;
-
-					$out.= '<option value="'.$obj->rowid.'"';
-					if ($disableline) $out.= ' disabled';
-					if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (! is_object($selected[0]) && in_array($obj->rowid,$selected) ))
-					{
-						$out.= ' selected';
-					}
-					$out.= '>';
+        global $conf,$user,$langs;
 
-					$out.= $obj->name;
-					if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
-					{
-						$out.= " (".$obj->label.")";
-					}
+        // Permettre l'exclusion de groupes
+        if (is_array($exclude))	$excludeGroups = implode("','",$exclude);
+        // Permettre l'inclusion de groupes
+        if (is_array($include))	$includeGroups = implode("','",$include);
+
+        if (!is_array($selected)) $selected = array($selected);
+
+        $out='';
+
+        // On recherche les groupes
+        $sql = "SELECT ug.rowid, ug.nom as name";
+        if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
+        {
+            $sql.= ", e.label";
+        }
+        $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
+        if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
+            if ($force_entity) $sql.= " WHERE ug.entity IN (0,".$force_entity.")";
+            else $sql.= " WHERE ug.entity IS NOT NULL";
+        }
+        else
+        {
+            $sql.= " WHERE ug.entity IN (0,".$conf->entity.")";
+        }
+        if (is_array($exclude) && $excludeGroups) $sql.= " AND ug.rowid NOT IN ('".$excludeGroups."')";
+        if (is_array($include) && $includeGroups) $sql.= " AND ug.rowid IN ('".$includeGroups."')";
+        $sql.= " ORDER BY ug.nom ASC";
+
+        dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            // Enhance with select2
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname);
+
+            $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled?' disabled':'').'>';
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                if ($show_empty && !$multiple) $out.= '<option value="-1"'.(in_array(-1,$selected)?' selected':'').'>&nbsp;</option>'."\n";
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $disableline=0;
+                    if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1;
+
+                    $out.= '<option value="'.$obj->rowid.'"';
+                    if ($disableline) $out.= ' disabled';
+                    if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (! is_object($selected[0]) && in_array($obj->rowid,$selected) ))
+                    {
+                        $out.= ' selected';
+                    }
+                    $out.= '>';
+
+                    $out.= $obj->name;
+                    if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
+                    {
+                        $out.= " (".$obj->label.")";
+                    }
+
+                    $out.= '</option>';
+                    $i++;
+                }
+            }
+            else
+            {
+                if ($show_empty) $out.= '<option value="-1"'.(in_array(-1,$selected)?' selected':'').'></option>'."\n";
+                $out.= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
+            }
+            $out.= '</select>';
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $out;
+    }
+
+
+    /**
+     *	Return HTML to show the search and clear seach button
+     *
+     *  @return	string
+     */
+    function showFilterButtons()
+    {
+        global $conf, $langs;
+
+        $out='<div class="nowrap">';
+        $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+        $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+        $out.='</div>';
+
+        return $out;
+    }
+
+    /**
+     *	Return HTML to show the search and clear seach button
+     *
+     *  @param  string  $cssclass                  CSS class
+     *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+     *  @return	string
+     */
+    function showCheckAddButtons($cssclass='checkforaction', $calljsfunction=0)
+    {
+        global $conf, $langs;
 
-					$out.= '</option>';
-					$i++;
-				}
-			}
-			else
-			{
-				if ($show_empty) $out.= '<option value="-1"'.(in_array(-1,$selected)?' selected':'').'></option>'."\n";
-				$out.= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
-			}
-			$out.= '</select>';
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $out;
-	}
-
-
-	/**
-	 *	Return HTML to show the search and clear seach button
-	 *
-	 *  @return	string
-	 */
-	function showFilterButtons()
-	{
-		global $conf, $langs;
-
-		$out='<div class="nowrap">';
-		$out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		$out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-		$out.='</div>';
-
-		return $out;
-	}
-
-	/**
-	 *	Return HTML to show the search and clear seach button
-	 *
-	 *  @param  string  $cssclass                  CSS class
-	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
-	 *  @return	string
-	 */
-	function showCheckAddButtons($cssclass='checkforaction', $calljsfunction=0)
-	{
-		global $conf, $langs;
-
-		$out='';
-		if (! empty($conf->use_javascript_ajax)) $out.='<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
-		$out.='<script type="text/javascript">
+        $out='';
+        if (! empty($conf->use_javascript_ajax)) $out.='<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
+        $out.='<script type="text/javascript">
             $(document).ready(function() {
             	$("#checkallactions").click(function() {
                     if($(this).is(\':checked\')){
@@ -7190,8 +7190,8 @@ 
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-		if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
-		$out.='         });
+        if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+        $out.='         });
 
         	$(".checkforselect").change(function() {
 				$(this).closest("tr").toggleClass("highlight", this.checked);
@@ -7200,78 +7200,78 @@ 
  	});
     </script>';
 
-		return $out;
-	}
-
-	/**
-	 *	Return HTML to show the search and clear seach button
-	 *
-	 *  @param	int  	$addcheckuncheckall        Add the check all/uncheck all checkbox (use javascript) and code to manage this
-	 *  @param  string  $cssclass                  CSS class
-	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
-	 *  @return	string
-	 */
-	function showFilterAndCheckAddButtons($addcheckuncheckall=0, $cssclass='checkforaction', $calljsfunction=0)
-	{
-		$out.=$this->showFilterButtons();
-		if ($addcheckuncheckall)
-		{
-			$out.=$this->showCheckAddButtons($cssclass, $calljsfunction);
-		}
-		return $out;
-	}
-
-	/**
-	 * Return HTML to show the select of expense categories
-	 *
-	 * @param	string	$selected              preselected category
-	 * @param	string	$htmlname              name of HTML select list
-	 * @param	integer	$useempty              1=Add empty line
-	 * @param	array	$excludeid             id to exclude
-	 * @param	string	$target                htmlname of target select to bind event
-	 * @param	int		$default_selected      default category to select if fk_c_type_fees change = EX_KME
-	 * @param	array	$params                param to give
-	 * @return	string
-	 */
-	function selectExpenseCategories($selected='', $htmlname='fk_c_exp_tax_cat', $useempty=0, $excludeid=array(), $target='', $default_selected=0, $params=array())
-	{
-		global $db, $conf, $langs, $user;
-
-		$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
-		$sql.= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
-		if (!empty($excludeid)) $sql.= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
-		$sql.= ' ORDER BY label';
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out.= '<option value="0">&nbsp;</option>';
-
-			while ($obj = $db->fetch_object($resql))
-			{
-				$out.= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';
-			}
-			$out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-
-			if (!empty($target))
-			{
-				$sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";
-				$resql = $db->query($sql);
-				if ($resql)
-				{
-					if ($db->num_rows($resql) > 0)
-					{
-						$obj = $db->fetch_object($resql);
-						$out.= '<script type="text/javascript">
+        return $out;
+    }
+
+    /**
+     *	Return HTML to show the search and clear seach button
+     *
+     *  @param	int  	$addcheckuncheckall        Add the check all/uncheck all checkbox (use javascript) and code to manage this
+     *  @param  string  $cssclass                  CSS class
+     *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+     *  @return	string
+     */
+    function showFilterAndCheckAddButtons($addcheckuncheckall=0, $cssclass='checkforaction', $calljsfunction=0)
+    {
+        $out.=$this->showFilterButtons();
+        if ($addcheckuncheckall)
+        {
+            $out.=$this->showCheckAddButtons($cssclass, $calljsfunction);
+        }
+        return $out;
+    }
+
+    /**
+     * Return HTML to show the select of expense categories
+     *
+     * @param	string	$selected              preselected category
+     * @param	string	$htmlname              name of HTML select list
+     * @param	integer	$useempty              1=Add empty line
+     * @param	array	$excludeid             id to exclude
+     * @param	string	$target                htmlname of target select to bind event
+     * @param	int		$default_selected      default category to select if fk_c_type_fees change = EX_KME
+     * @param	array	$params                param to give
+     * @return	string
+     */
+    function selectExpenseCategories($selected='', $htmlname='fk_c_exp_tax_cat', $useempty=0, $excludeid=array(), $target='', $default_selected=0, $params=array())
+    {
+        global $db, $conf, $langs, $user;
+
+        $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
+        $sql.= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
+        if (!empty($excludeid)) $sql.= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
+        $sql.= ' ORDER BY label';
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
+            if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+
+            while ($obj = $db->fetch_object($resql))
+            {
+                $out.= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';
+            }
+            $out.= '</select>';
+            if (! empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+
+            if (!empty($target))
+            {
+                $sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";
+                $resql = $db->query($sql);
+                if ($resql)
+                {
+                    if ($db->num_rows($resql) > 0)
+                    {
+                        $obj = $db->fetch_object($resql);
+                        $out.= '<script type="text/javascript">
 							$(function() {
 								$("select[name='.$target.']").on("change", function() {
 									var current_val = $(this).val();
 									if (current_val == '.$obj->id.') {';
-						if (!empty($default_selected) || !empty($selected)) $out.= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';
+                        if (!empty($default_selected) || !empty($selected)) $out.= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';
 
-						$out.= '
+                        $out.= '
 										$("select[name='.$htmlname.']").change();
 									}
 								});
@@ -7302,92 +7302,92 @@ 
 								});
 							});
 						</script>';
-					}
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-
-		return $out;
-	}
-
-	/**
-	 * Return HTML to show the select ranges of expense range
-	 *
-	 * @param	string	$selected    preselected category
-	 * @param	string	$htmlname    name of HTML select list
-	 * @param	integer	$useempty    1=Add empty line
-	 * @return	string
-	 */
-	function selectExpenseRanges($selected='', $htmlname='fk_range', $useempty=0)
-	{
-		global $db,$conf,$langs;
-
-		$sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
-		$sql.= ' WHERE entity = '.$conf->entity.' AND active = 1';
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out.= '<option value="0"></option>';
-
-			while ($obj = $db->fetch_object($resql))
-			{
-				$out.= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
-			}
-			$out.= '</select>';
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-
-		return $out;
-	}
-
-	/**
-	 * Return HTML to show a select of expense
-	 *
-	 * @param	string	$selected    preselected category
-	 * @param	string	$htmlname    name of HTML select list
-	 * @param	integer	$useempty    1=Add empty choice
-	 * @param	integer	$allchoice   1=Add all choice
-	 * @param	integer	$useid       0=use 'code' as key, 1=use 'id' as key
-	 * @return	string
-	 */
-	function selectExpense($selected='', $htmlname='fk_c_type_fees', $useempty=0, $allchoice=1, $useid=0)
-	{
-		global $db,$langs;
-
-		$sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
-		$sql.= ' WHERE active = 1';
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out.= '<option value="0"></option>';
-			if ($allchoice) $out.= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';
-
-			$field = 'code';
-			if ($useid) $field = 'id';
-
-			while ($obj = $db->fetch_object($resql))
-			{
-				$key = $langs->trans($obj->code);
-				$out.= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
-			}
-			$out.= '</select>';
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-
-		return $out;
-	}
+                    }
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+
+        return $out;
+    }
+
+    /**
+     * Return HTML to show the select ranges of expense range
+     *
+     * @param	string	$selected    preselected category
+     * @param	string	$htmlname    name of HTML select list
+     * @param	integer	$useempty    1=Add empty line
+     * @return	string
+     */
+    function selectExpenseRanges($selected='', $htmlname='fk_range', $useempty=0)
+    {
+        global $db,$conf,$langs;
+
+        $sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
+        $sql.= ' WHERE entity = '.$conf->entity.' AND active = 1';
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
+            if ($useempty) $out.= '<option value="0"></option>';
+
+            while ($obj = $db->fetch_object($resql))
+            {
+                $out.= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
+            }
+            $out.= '</select>';
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+
+        return $out;
+    }
+
+    /**
+     * Return HTML to show a select of expense
+     *
+     * @param	string	$selected    preselected category
+     * @param	string	$htmlname    name of HTML select list
+     * @param	integer	$useempty    1=Add empty choice
+     * @param	integer	$allchoice   1=Add all choice
+     * @param	integer	$useid       0=use 'code' as key, 1=use 'id' as key
+     * @return	string
+     */
+    function selectExpense($selected='', $htmlname='fk_c_type_fees', $useempty=0, $allchoice=1, $useid=0)
+    {
+        global $db,$langs;
+
+        $sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
+        $sql.= ' WHERE active = 1';
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
+            if ($useempty) $out.= '<option value="0"></option>';
+            if ($allchoice) $out.= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';
+
+            $field = 'code';
+            if ($useid) $field = 'id';
+
+            while ($obj = $db->fetch_object($resql))
+            {
+                $key = $langs->trans($obj->code);
+                $out.= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
+            }
+            $out.= '</select>';
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+
+        return $out;
+    }
 }

dolibarr/htdocs/core/class/html.formadmin.class.php

Indentation +268 added lines, -268 removed lines

@@ -29,100 +29,100 @@ 
  */
 class FormAdmin
 {
-	var $db;
-	var $error;
+    var $db;
+    var $error;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Return html select list with available languages (key='en_US', value='United States' for example)
-	 *
-	 *    	@param      string		$selected       Language pre-selected
-	 *    	@param      string		$htmlname       Name of HTML select
-	 *    	@param      int			$showauto       Show 'auto' choice
-	 * 		@param		array		$filter			Array of keys to exclude in list
-	 * 		@param		string		$showempty		'1'=Add empty value or string to show
-	 *      @param      int			$showwarning    Show a warning if language is not complete
-	 *      @param		int			$disabled		Disable edit of select
-	 *      @param		string		$morecss		Add more css styles
-	 *      @param      int         $showcode       1=Add language code into label at begining, 2=Add language code into label at end
-	 *      @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
-	 *      @return		string						Return HTML select string with list of languages
+    /**
+     *    	Return html select list with available languages (key='en_US', value='United States' for example)
+     *
+     *    	@param      string		$selected       Language pre-selected
+     *    	@param      string		$htmlname       Name of HTML select
+     *    	@param      int			$showauto       Show 'auto' choice
+     * 		@param		array		$filter			Array of keys to exclude in list
+     * 		@param		string		$showempty		'1'=Add empty value or string to show
+     *      @param      int			$showwarning    Show a warning if language is not complete
+     *      @param		int			$disabled		Disable edit of select
+     *      @param		string		$morecss		Add more css styles
+     *      @param      int         $showcode       1=Add language code into label at begining, 2=Add language code into label at end
+     *      @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
+     *      @return		string						Return HTML select string with list of languages
      */
-	function select_language($selected='', $htmlname='lang_id', $showauto=0, $filter=null, $showempty='', $showwarning=0, $disabled=0, $morecss='', $showcode=0, $forcecombo=0)
-	{
-		// phpcs:enable
-		global $langs;
-
-		$langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
-
-		$out='';
-
-		$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
-		if ($showempty)
-		{
-			$out.= '<option value="0"';
-			if ($selected == '') $out.= ' selected';
-			$out.= '>';
-			if ($showempty != '1') $out.=$showempty;
-			else $out.='&nbsp;';
-			$out.='</option>';
-		}
-		if ($showauto)
-		{
-			$out.= '<option value="auto"';
-			if ($selected == 'auto') $out.= ' selected';
-			$out.= '>'.$langs->trans("AutoDetectLang").'</option>';
-		}
-
-		asort($langs_available);
-
-		foreach ($langs_available as $key => $value)
-		{
-			$valuetoshow=$value;
-			if ($showcode == 1) $valuetoshow=$key.' - '.$value;
-			if ($showcode == 2) $valuetoshow=$value.' ('.$key.')';
-
-			if ($filter && is_array($filter))
-			{
-				if ( ! array_key_exists($key, $filter))
-				{
-					$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
-				}
-			}
-			else if ($selected == $key)
-			{
-				$out.= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
-			}
-			else
-			{
-				$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
-			}
-		}
-		$out.= '</select>';
-
-		// Make select dynamic
-		if (! $forcecombo)
-		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			$out.= ajax_combobox($htmlname);
-		}
-
-		return $out;
-	}
+    function select_language($selected='', $htmlname='lang_id', $showauto=0, $filter=null, $showempty='', $showwarning=0, $disabled=0, $morecss='', $showcode=0, $forcecombo=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        $langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
+
+        $out='';
+
+        $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
+        if ($showempty)
+        {
+            $out.= '<option value="0"';
+            if ($selected == '') $out.= ' selected';
+            $out.= '>';
+            if ($showempty != '1') $out.=$showempty;
+            else $out.='&nbsp;';
+            $out.='</option>';
+        }
+        if ($showauto)
+        {
+            $out.= '<option value="auto"';
+            if ($selected == 'auto') $out.= ' selected';
+            $out.= '>'.$langs->trans("AutoDetectLang").'</option>';
+        }
+
+        asort($langs_available);
+
+        foreach ($langs_available as $key => $value)
+        {
+            $valuetoshow=$value;
+            if ($showcode == 1) $valuetoshow=$key.' - '.$value;
+            if ($showcode == 2) $valuetoshow=$value.' ('.$key.')';
+
+            if ($filter && is_array($filter))
+            {
+                if ( ! array_key_exists($key, $filter))
+                {
+                    $out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
+                }
+            }
+            else if ($selected == $key)
+            {
+                $out.= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
+            }
+            else
+            {
+                $out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
+            }
+        }
+        $out.= '</select>';
+
+        // Make select dynamic
+        if (! $forcecombo)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out.= ajax_combobox($htmlname);
+        }
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *    Return list of available menus (eldy_backoffice, ...)
      *
      *    @param	string		$selected        Preselected menu value
@@ -133,7 +133,7 @@ 
      */
     function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs,$conf;
 
         // Clean parameters
@@ -142,7 +142,7 @@ 
         // Check parameters
         if (! is_array($dirmenuarray)) return -1;
 
-		$menuarray=array();
+        $menuarray=array();
         foreach ($conf->file->dol_document_root as $dirroot)
         {
             foreach($dirmenuarray as $dirtoscan)
@@ -151,65 +151,65 @@ 
                 //print $dir.'<br>';
                 if (is_dir($dir))
                 {
-    	            $handle=opendir($dir);
-    	            if (is_resource($handle))
-    	            {
-    	                while (($file = readdir($handle))!==false)
-    	                {
-    	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
-    	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-
-    	                        $filelib=preg_replace('/\.php$/i','',$file);
-    	        				$prefix='';
-    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
+                    $handle=opendir($dir);
+                    if (is_resource($handle))
+                    {
+                        while (($file = readdir($handle))!==false)
+                        {
+                            if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
+                            {
+                                if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
+                                if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
+                                if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+                                if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+
+                                $filelib=preg_replace('/\.php$/i','',$file);
+                                $prefix='';
+                                // 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+                                if (preg_match('/^eldy/i',$file)) $prefix='0';
                                 else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
-
-    	                        if ($file == $selected)
-    	                        {
-    	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
-    	                        {
-    	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
-    	                        }
-    	                    }
-    	                }
-    	                closedir($handle);
-    	            }
+                                else $prefix='3';
+
+                                if ($file == $selected)
+                                {
+                                    $menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
+                                }
+                                else
+                                {
+                                    $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
+                                }
+                            }
+                        }
+                        closedir($handle);
+                    }
                 }
             }
         }
-		ksort($menuarray);
+        ksort($menuarray);
 
-		// Output combo list of menus
+        // Output combo list of menus
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
         $oldprefix='';
-		foreach ($menuarray as $key => $val)
-		{
-			$tab=explode('_',$key);
-			$newprefix=$tab[0];
-			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
-			if ($newprefix != $oldprefix)	// Add separators
-			{
-				// Affiche titre
-				print '<option value="-1" disabled>';
-				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
+        foreach ($menuarray as $key => $val)
+        {
+            $tab=explode('_',$key);
+            $newprefix=$tab[0];
+            if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
+            if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
+            if ($newprefix != $oldprefix)	// Add separators
+            {
+                // Affiche titre
+                print '<option value="-1" disabled>';
+                if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
                 if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
-				print '</option>';
-				$oldprefix=$newprefix;
-			}
-			print $val."\n";	// Show menu entry
-		}
-		print '</select>';
+                if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
+                if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
+                print '</option>';
+                $oldprefix=$newprefix;
+            }
+            print $val."\n";	// Show menu entry
+        }
+        print '</select>';
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -223,65 +223,65 @@ 
      */
     function select_menu_families($selected, $htmlname, $dirmenuarray)
     {
-		// phpcs:enable
-		global $langs,$conf;
+        // phpcs:enable
+        global $langs,$conf;
 
         //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
-		$expdevmenu=array();
+        $expdevmenu=array();
 
-		$menuarray=array();
+        $menuarray=array();
 
-		foreach($dirmenuarray as $dirmenu)
-		{
+        foreach($dirmenuarray as $dirmenu)
+        {
             foreach ($conf->file->dol_document_root as $dirroot)
             {
                 $dir=$dirroot.$dirmenu;
                 if (is_dir($dir))
                 {
-	                $handle=opendir($dir);
-	                if (is_resource($handle))
-	                {
-	        			while (($file = readdir($handle))!==false)
-	        			{
-	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-	        				{
-	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
-
-	        					$menuarray[$filelib]=1;
-	        				}
-	        				$menuarray['all']=1;
-	        			}
-	        			closedir($handle);
-	                }
+                    $handle=opendir($dir);
+                    if (is_resource($handle))
+                    {
+                        while (($file = readdir($handle))!==false)
+                        {
+                            if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+                            {
+                                $filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
+                                if (preg_match('/^index/i',$filelib)) continue;
+                                if (preg_match('/^default/i',$filelib)) continue;
+                                if (preg_match('/^empty/i',$filelib)) continue;
+                                if (preg_match('/\.lib/i',$filelib)) continue;
+                                if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
+
+                                $menuarray[$filelib]=1;
+                            }
+                            $menuarray['all']=1;
+                        }
+                        closedir($handle);
+                    }
                 }
             }
-		}
+        }
 
-		ksort($menuarray);
+        ksort($menuarray);
 
-		// Affichage liste deroulante des menus
+        // Affichage liste deroulante des menus
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
         $oldprefix='';
-		foreach ($menuarray as $key => $val)
-		{
-			$tab=explode('_',$key);
-			$newprefix=$tab[0];
-			print '<option value="'.$key.'"';
+        foreach ($menuarray as $key => $val)
+        {
+            $tab=explode('_',$key);
+            $newprefix=$tab[0];
+            print '<option value="'.$key.'"';
             if ($key == $selected)
-			{
-				print '	selected';
-			}
-			print '>';
-			if ($key == 'all') print $langs->trans("AllMenus");
-			else print $key;
-			print '</option>'."\n";
-		}
-		print '</select>';
+            {
+                print '	selected';
+            }
+            print '>';
+            if ($key == 'all') print $langs->trans("AllMenus");
+            else print $key;
+            print '</option>'."\n";
+        }
+        print '</select>';
     }
 
 
@@ -295,70 +295,70 @@ 
      */
     function select_timezone($selected,$htmlname)
     {
-		// phpcs:enable
-		global $langs,$conf;
+        // phpcs:enable
+        global $langs,$conf;
 
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-		print '<option value="-1">&nbsp;</option>';
-
-		$arraytz=array(
-			"Pacific/Midway"=>"GMT-11:00",
-			"Pacific/Fakaofo"=>"GMT-10:00",
-			"America/Anchorage"=>"GMT-09:00",
-			"America/Los_Angeles"=>"GMT-08:00",
-			"America/Dawson_Creek"=>"GMT-07:00",
-			"America/Chicago"=>"GMT-06:00",
-			"America/Bogota"=>"GMT-05:00",
-			"America/Anguilla"=>"GMT-04:00",
-			"America/Araguaina"=>"GMT-03:00",
-			"America/Noronha"=>"GMT-02:00",
-			"Atlantic/Azores"=>"GMT-01:00",
-			"Africa/Abidjan"=>"GMT+00:00",
-			"Europe/Paris"=>"GMT+01:00",
-			"Europe/Helsinki"=>"GMT+02:00",
-			"Europe/Moscow"=>"GMT+03:00",
-			"Asia/Dubai"=>"GMT+04:00",
-			"Asia/Karachi"=>"GMT+05:00",
-			"Indian/Chagos"=>"GMT+06:00",
-			"Asia/Jakarta"=>"GMT+07:00",
-			"Asia/Hong_Kong"=>"GMT+08:00",
-			"Asia/Tokyo"=>"GMT+09:00",
-			"Australia/Sydney"=>"GMT+10:00",
-			"Pacific/Noumea"=>"GMT+11:00",
-			"Pacific/Auckland"=>"GMT+12:00",
-			"Pacific/Enderbury"=>"GMT+13:00"
-		);
-		foreach ($arraytz as $lib => $gmt)
-		{
-			print '<option value="'.$lib.'"';
-			if ($selected == $lib || $selected == $gmt) print ' selected';
-			print '>'.$gmt.'</option>'."\n";
-		}
-		print '</select>';
-	}
+        print '<option value="-1">&nbsp;</option>';
+
+        $arraytz=array(
+            "Pacific/Midway"=>"GMT-11:00",
+            "Pacific/Fakaofo"=>"GMT-10:00",
+            "America/Anchorage"=>"GMT-09:00",
+            "America/Los_Angeles"=>"GMT-08:00",
+            "America/Dawson_Creek"=>"GMT-07:00",
+            "America/Chicago"=>"GMT-06:00",
+            "America/Bogota"=>"GMT-05:00",
+            "America/Anguilla"=>"GMT-04:00",
+            "America/Araguaina"=>"GMT-03:00",
+            "America/Noronha"=>"GMT-02:00",
+            "Atlantic/Azores"=>"GMT-01:00",
+            "Africa/Abidjan"=>"GMT+00:00",
+            "Europe/Paris"=>"GMT+01:00",
+            "Europe/Helsinki"=>"GMT+02:00",
+            "Europe/Moscow"=>"GMT+03:00",
+            "Asia/Dubai"=>"GMT+04:00",
+            "Asia/Karachi"=>"GMT+05:00",
+            "Indian/Chagos"=>"GMT+06:00",
+            "Asia/Jakarta"=>"GMT+07:00",
+            "Asia/Hong_Kong"=>"GMT+08:00",
+            "Asia/Tokyo"=>"GMT+09:00",
+            "Australia/Sydney"=>"GMT+10:00",
+            "Pacific/Noumea"=>"GMT+11:00",
+            "Pacific/Auckland"=>"GMT+12:00",
+            "Pacific/Enderbury"=>"GMT+13:00"
+        );
+        foreach ($arraytz as $lib => $gmt)
+        {
+            print '<option value="'.$lib.'"';
+            if ($selected == $lib || $selected == $gmt) print ' selected';
+            print '>'.$gmt.'</option>'."\n";
+        }
+        print '</select>';
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return html select list with available languages (key='en_US', value='United States' for example)
-	 *
-	 *  @param      string	$selected       Paper format pre-selected
-	 *  @param      string	$htmlname       Name of HTML select field
-	 * 	@param		string	$filter			Value to filter on code
-	 * 	@param		int		$showempty		Add empty value
-	 * 	@return		string					Return HTML output
-	 */
-	function select_paper_format($selected='',$htmlname='paperformat_id',$filter=0,$showempty=0)
-	{
-		// phpcs:enable
-		global $langs;
-
-		$langs->load("dict");
-
-		$sql = "SELECT code, label, width, height, unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
-		$sql.= " WHERE active=1";
+    /**
+     *  Return html select list with available languages (key='en_US', value='United States' for example)
+     *
+     *  @param      string	$selected       Paper format pre-selected
+     *  @param      string	$htmlname       Name of HTML select field
+     * 	@param		string	$filter			Value to filter on code
+     * 	@param		int		$showempty		Add empty value
+     * 	@return		string					Return HTML output
+     */
+    function select_paper_format($selected='',$htmlname='paperformat_id',$filter=0,$showempty=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        $langs->load("dict");
+
+        $sql = "SELECT code, label, width, height, unit";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
+        $sql.= " WHERE active=1";
         if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
 
         $resql=$this->db->query($sql);
@@ -377,32 +377,32 @@ 
             }
         }
         else
-		{
-			dol_print_error($this->db);
-			return '';
-		}
-		$out='';
-
-		$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-		if ($showempty)
-		{
-			$out.= '<option value=""';
-			if ($selected == '') $out.= ' selected';
-			$out.= '>&nbsp;</option>';
-		}
-		foreach ($paperformat as $key => $value)
-		{
+        {
+            dol_print_error($this->db);
+            return '';
+        }
+        $out='';
+
+        $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+        if ($showempty)
+        {
+            $out.= '<option value=""';
+            if ($selected == '') $out.= ' selected';
+            $out.= '>&nbsp;</option>';
+        }
+        foreach ($paperformat as $key => $value)
+        {
             if ($selected == $key)
-			{
-				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
-			}
-			else
-			{
-				$out.= '<option value="'.$key.'">'.$value.'</option>';
-			}
-		}
-		$out.= '</select>';
-
-		return $out;
-	}
+            {
+                $out.= '<option value="'.$key.'" selected>'.$value.'</option>';
+            }
+            else
+            {
+                $out.= '<option value="'.$key.'">'.$value.'</option>';
+            }
+        }
+        $out.= '</select>';
+
+        return $out;
+    }
 }