Standardize and update code

This commit is contained in:
Philippe GRAND 2018-09-20 17:26:39 +02:00
parent e1a03c49cf
commit 9c9f5bd3c3
2 changed files with 25 additions and 9 deletions

View File

@ -107,6 +107,11 @@ class Societe extends CommonObject
*/ */
public $nom; public $nom;
/**
* @var string name
*/
public $name;
/** /**
* Alias names (commercial, trademark or alias names) * Alias names (commercial, trademark or alias names)
* @var string * @var string

View File

@ -1,11 +1,11 @@
<?php <?php
/* Copyright (c) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (c) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (c) 2005-2018 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (c) 2005-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (c) 2005-2018 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (c) 2005-2018 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Alexis Algoud <alexis@atm-consulting.fr> * Copyright (C) 2014 Alexis Algoud <alexis@atm-consulting.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -46,6 +46,7 @@ class UserGroup extends CommonObject
public $table_element='usergroup'; public $table_element='usergroup';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='group'; public $picto='group';
/** /**
@ -53,16 +54,26 @@ class UserGroup extends CommonObject
*/ */
public $entity; public $entity;
public $name; // Name of group
/** /**
* @var string
* @deprecated * @deprecated
* @see name * @see name
*/ */
public $nom; // Name of group public $nom;
/**
* @var string name
*/
public $name; // Name of group
public $globalgroup; // Global group public $globalgroup; // Global group
public $datec; // Creation date of group public $datec; // Creation date of group
public $datem; // Modification date of group public $datem; // Modification date of group
public $note; // Description public $note; // Description
public $members=array(); // Array of users public $members=array(); // Array of users
public $nb_rights; // Number of rights granted to the user public $nb_rights; // Number of rights granted to the user