Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
c04c62e62c
@ -37,7 +37,7 @@ class Facturation
|
||||
* int $prix => Prix HT du produit en cours
|
||||
* int $tva => 'rowid' du taux de tva dans llx_c_tva
|
||||
*/
|
||||
var $id;
|
||||
public $id;
|
||||
protected $ref;
|
||||
protected $qte;
|
||||
protected $stock;
|
||||
|
||||
@ -34,20 +34,20 @@ class Establishment extends CommonObject
|
||||
public $fk_element = 'fk_establishment';
|
||||
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
|
||||
|
||||
var $id;
|
||||
var $rowid;
|
||||
public $id;
|
||||
public $rowid;
|
||||
|
||||
var $name;
|
||||
var $address;
|
||||
var $zip;
|
||||
var $town;
|
||||
var $status; // 0=open, 1=closed
|
||||
var $entity;
|
||||
public $name;
|
||||
public $address;
|
||||
public $zip;
|
||||
public $town;
|
||||
public $status; // 0=open, 1=closed
|
||||
public $entity;
|
||||
|
||||
var $country_id;
|
||||
public $country_id;
|
||||
|
||||
var $statuts=array();
|
||||
var $statuts_short=array();
|
||||
public $statuts=array();
|
||||
public $statuts_short=array();
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
||||
@ -29,14 +29,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
|
||||
*/
|
||||
class Service extends CommonObject
|
||||
{
|
||||
var $libelle;
|
||||
var $price;
|
||||
var $tms;
|
||||
var $debut;
|
||||
var $fin;
|
||||
public $libelle;
|
||||
public $price;
|
||||
public $tms;
|
||||
public $debut;
|
||||
public $fin;
|
||||
|
||||
var $debut_epoch;
|
||||
var $fin_epoch;
|
||||
public $debut_epoch;
|
||||
public $fin_epoch;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
||||
@ -38,20 +38,20 @@ class UserGroup extends CommonObject
|
||||
public $table_element='usergroup';
|
||||
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
|
||||
|
||||
var $entity; // Entity of group
|
||||
public $entity; // Entity of group
|
||||
/**
|
||||
* @deprecated
|
||||
* @see name
|
||||
*/
|
||||
var $nom; // Name of group
|
||||
var $globalgroup; // Global group
|
||||
var $datec; // Creation date of group
|
||||
var $datem; // Modification date of group
|
||||
var $members=array(); // Array of users
|
||||
public $nom; // Name of group
|
||||
public $globalgroup; // Global group
|
||||
public $datec; // Creation date of group
|
||||
public $datem; // Modification date of group
|
||||
public $members=array(); // Array of users
|
||||
|
||||
private $_tab_loaded=array(); // Array of cache of already loaded permissions
|
||||
|
||||
var $oldcopy; // To contains a clone of this when we need to save old properties of object
|
||||
public $oldcopy; // To contains a clone of this when we need to save old properties of object
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Loading…
Reference in New Issue
Block a user