Merge pull request #36599 from frederic34/patch-14
Fix CI v21 Update commonobject.class.php with same phpdoc than in develop
This commit is contained in:
commit
f9ea66a205
2 changed files with 3 additions and 3 deletions
|
|
@ -270,12 +270,12 @@ class Propal extends CommonObject
|
|||
public $address;
|
||||
|
||||
/**
|
||||
* @var int availability ID
|
||||
* @var ?int availability ID can be null in db
|
||||
*/
|
||||
public $availability_id;
|
||||
|
||||
/**
|
||||
* @var int availability ID
|
||||
* @var ?int availability ID
|
||||
* @deprecated
|
||||
* @see $availability_id
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -491,7 +491,7 @@ abstract class CommonObject
|
|||
public $fk_delivery_address;
|
||||
|
||||
/**
|
||||
* @var int Shipping method ID
|
||||
* @var ?int Shipping method ID
|
||||
* @see setShippingMethod()
|
||||
*/
|
||||
public $shipping_method_id;
|
||||
|
|
|
|||
Loading…
Reference in a new issue