Merge remote-tracking branch 'origin/new_branch_30_10_2019' into new_branch_30_10_2019
This commit is contained in:
commit
551b4829f4
@ -53,7 +53,7 @@ class Holiday extends CommonObject
|
|||||||
* @var int Field with ID of parent key if this field has a parent
|
* @var int Field with ID of parent key if this field has a parent
|
||||||
*/
|
*/
|
||||||
public $fk_element = 'fk_holiday';
|
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
|
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
|
||||||
*/
|
*/
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user