Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2024-01-10 16:24:49 +01:00
commit 0a00afcad3
2 changed files with 2 additions and 1 deletions

View file

@ -1598,6 +1598,7 @@ class ExtraFields
} else if ( $element == 'projet' ) {
$element = 'project';
}
//$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, 0, '');
$out = $form->selectForForms($tmparray[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, 0, '', $element.':options_'.$key);
} elseif ($type == 'password') {

View file

@ -374,7 +374,7 @@ class modSociete extends DolibarrModules
's.code_compta'=>"AccountancyCode", 's.code_compta_fournisseur'=>"SupplierAccountancyCode",
's.client'=>'Customer', 's.fournisseur'=>'Supplier',
's.address'=>'Address', 's.zip'=>"Zip", 's.town'=>"Town", 's.phone'=>'Phone', 's.email'=>"Email",
'c.note_private'=>'NotePrivate', 'c.note_public'=>"NotePublic",
's.note_private'=>'NotePrivate', 's.note_public'=>"NotePublic",
't.code'=>"ThirdPartyType"
);
// Add multicompany field