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

This commit is contained in:
Laurent Destailleur 2022-05-21 10:40:00 +02:00
commit 4a2a6fd747
2 changed files with 2 additions and 0 deletions

View File

@ -155,6 +155,7 @@ class Asset extends CommonObject
public $import_key;
public $model_pdf;
public $status;
public $supplier_invoice_id;
// /**
// * @var string Field with ID of parent key if this object has a parent

View File

@ -129,6 +129,7 @@ class AssetModel extends CommonObject
public $import_key;
public $model_pdf;
public $status;
public $asset_depreciation_options;
// /**
// * @var string Field with ID of parent key if this object has a parent