Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject

fix extrafields linnktoObject Thirdpary option showAdress
This commit is contained in:
Laurent Destailleur 2020-07-18 19:13:52 +02:00 committed by GitHub
commit ecfcbeef26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -725,6 +725,8 @@ class Societe extends CommonObject
*/
public function __construct($db)
{
global $conf;
$this->db = $db;
$this->client = 0;
@ -735,6 +737,13 @@ class Societe extends CommonObject
$this->forme_juridique_code = 0;
$this->tva_assuj = 1;
$this->status = 1;
if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
$this->fields['address']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
$this->fields['zip']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
$this->fields['town']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
//$this->fields['fk_pays']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
}
}