lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-02 18:40:51 +01:00
commit c04c62e62c
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/cashdesk/class/Facturation.class.php
View File

@ -37,7 +37,7 @@ class Facturation
* int $prix => Prix HT du produit en cours * int $prix => Prix HT du produit en cours
* int $tva => 'rowid' du taux de tva dans llx_c_tva * int $tva => 'rowid' du taux de tva dans llx_c_tva
*/ */
var $id; public $id;
protected $ref; protected $ref;
protected $qte; protected $qte;
protected $stock; protected $stock;

22
htdocs/hrm/class/establishment.class.php
View File

@ -34,20 +34,20 @@ class Establishment extends CommonObject
public $fk_element = 'fk_establishment'; public $fk_element = 'fk_establishment';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id; public $id;
var $rowid; public $rowid;
var $name; public $name;
var $address; public $address;
var $zip; public $zip;
var $town; public $town;
var $status; // 0=open, 1=closed public $status; // 0=open, 1=closed
var $entity; public $entity;
var $country_id; public $country_id;
var $statuts=array(); public $statuts=array();
var $statuts_short=array(); public $statuts_short=array();
/** /**
* Constructor * Constructor

14
htdocs/product/class/service.class.php
View File

@ -29,14 +29,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/ */
class Service extends CommonObject class Service extends CommonObject
{ {
var $libelle; public $libelle;
var $price; public $price;
var $tms; public $tms;
var $debut; public $debut;
var $fin; public $fin;
var $debut_epoch; public $debut_epoch;
var $fin_epoch; public $fin_epoch;
/** /**
* Constructor * Constructor

14
htdocs/user/class/usergroup.class.php
View File

@ -38,20 +38,20 @@ class UserGroup extends CommonObject
public $table_element='usergroup'; public $table_element='usergroup';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe 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 * @deprecated
* @see name * @see name
*/ */
var $nom; // Name of group public $nom; // Name of group
var $globalgroup; // Global group public $globalgroup; // Global group
var $datec; // Creation date of group public $datec; // Creation date of group
var $datem; // Modification date of group public $datem; // Modification date of group
var $members=array(); // Array of users public $members=array(); // Array of users
private $_tab_loaded=array(); // Array of cache of already loaded permissions 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
/** /**