Merge pull request #9628 from grandoc/new_branch_28_09_2018

Standardize and update code
This commit is contained in:
Laurent Destailleur 2018-10-01 01:04:36 +02:00 committed by GitHub
commit ae62204a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 87 additions and 25 deletions

View File

@ -56,8 +56,10 @@ class AdherentType extends CommonObject
*/
public $libelle;
/** @var string Label */
public $label;
/**
* @var string Adherent type label
*/
public $label;
/**
* @var int Subsription required (0 or 1)

View File

@ -108,17 +108,17 @@ class Asset extends CommonObject
public $entity;
/**
* @var string Asset label
*/
public $label;
/**
* @var string Asset label
*/
public $label;
public $amount;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $fk_soc;
/**
* @var string description

View File

@ -46,8 +46,10 @@ class AssetType extends CommonObject
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/** @var string Label */
public $label;
/**
* @var string Asset type label
*/
public $label;
/** @var string Accountancy code asset */
public $accountancy_code_asset;

View File

@ -59,7 +59,7 @@ class Account extends CommonObject
public $rowid;
/**
* Label
* Account Label
* @var string
*/
public $label;

View File

@ -99,7 +99,11 @@ class EmailSenderProfile extends CommonObject
*/
public $entity;
public $label;
/**
* @var string Email Sender Profile label
*/
public $label;
public $email;
public $date_creation;
public $tms;

View File

@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
/**
* Crob Job class
* Cron Job class
*/
class Cronjob extends CommonObject
{
@ -53,7 +53,12 @@ class Cronjob extends CommonObject
public $jobtype;
public $tms='';
public $datec='';
public $label;
/**
* @var string Cron Job label
*/
public $label;
public $command;
public $classesname;
public $objectname;
@ -1351,7 +1356,12 @@ class Cronjobline
public $tms='';
public $datec='';
public $label;
/**
* @var string Cron Job Line label
*/
public $label;
public $jobtype;
public $command;
public $classesname;

View File

@ -56,7 +56,12 @@ class EcmFiles extends CommonObject
*/
public $ref;
public $label; // hash of file content (md5_file(dol_osencode($destfull))
/**
* hash of file content (md5_file(dol_osencode($destfull))
* @var string Ecm Files label
*/
public $label;
public $share; // hash for file sharing, empty by default (example: getRandomPassword(true))
/**
@ -848,7 +853,10 @@ class EcmFiles extends CommonObject
class EcmfilesLine
{
public $label;
/**
* @var string ECM files line label
*/
public $label;
/**
* @var int Entity

View File

@ -3159,7 +3159,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
// From llx_commande_fournisseurdet
public $fk_parent_line;
public $fk_facture;
/**
* @var string supplier order line label
*/
public $label;
public $rang = 0;
public $special_code = 0;

View File

@ -50,7 +50,12 @@ class Loan extends CommonObject
public $datestart;
public $dateend;
public $label;
/**
* @var string Loan label
*/
public $label;
public $capital;
public $nbterm;
public $rate;
@ -454,7 +459,7 @@ class Loan extends CommonObject
return $result;
}
/**
* Initialise an instance with random values.
* Used to build previews or test instances.
@ -465,9 +470,9 @@ class Loan extends CommonObject
function initAsSpecimen()
{
global $user, $langs, $conf;
$now=dol_now();
// Initialise parameters
$this->id = 0;
$this->fk_bank = 1;

View File

@ -116,7 +116,11 @@ class MyObject extends CommonObject
*/
public $entity;
public $label;
/**
* @var string label
*/
public $label;
public $amount;
public $status;
public $date_creation;

View File

@ -50,7 +50,12 @@ class MouvementStock extends CommonObject
public $datem = '';
public $price;
public $fk_user_author;
public $label;
/**
* @var string stock movements label
*/
public $label;
public $fk_origin;
public $origintype;
public $inventorycode;

View File

@ -39,7 +39,12 @@ class Address
public $id;
public $type;
public $label;
/**
* @var string Address label
*/
public $label;
public $socid;
public $name;
public $address;
@ -510,7 +515,12 @@ class AddressLine
public $date_creation;
public $date_modification;
public $label;
/**
* @var string stock movements label
*/
public $label;
public $name;
public $address;
public $zip;

View File

@ -129,7 +129,11 @@ class CompanyPaymentMode extends CommonObject
*/
public $fk_soc;
public $label;
/**
* @var string company payment mode label
*/
public $label;
public $bank;
public $code_banque;
public $code_guichet;

View File

@ -60,6 +60,9 @@ class ActionsTicket
public $template_dir;
public $template;
/**
* @var string ticket action label
*/
public $label;
/**