Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
b92d794f77
@ -42,15 +42,15 @@ class WorkstationResource extends CommonObject
|
|||||||
'fk_resource' => array ('type' => 'integer')
|
'fk_resource' => array ('type' => 'integer')
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int ID of workstation
|
* @var int ID of workstation
|
||||||
*/
|
*/
|
||||||
public $fk_workstation;
|
public $fk_workstation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int ID of dolresource
|
* @var int ID of dolresource
|
||||||
*/
|
*/
|
||||||
public $fk_resource;
|
public $fk_resource;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user