Merge remote-tracking branch 'origin/new_branch_30_10_2019' into new_branch_30_10_2019

This commit is contained in:
Philippe GRAND 2019-10-30 09:54:44 +01:00
commit 551b4829f4

View File

@ -53,7 +53,7 @@ class Holiday extends CommonObject
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_holiday';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/