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

Merge pull request #9399 from grandoc/new_branch_03_09_2018

Browse Source 
New branch 03 09 2018
This commit is contained in:
Laurent Destailleur 2018-09-04 15:59:00 +02:00 committed by GitHub
commit b3e6d4a943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
99 changed files with 1585 additions and 886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/accountancy/class/accountancycategory.class.php
View File

@ -56,24 +56,69 @@ class AccountancyCategory // extends CommonObject
*/
public $table_element='c_accounting_category';
public $id;
/**
* @var int ID
*/
public $id;
/**
* @var mixed Sample property 1
*/
public $code;
/**
* @var string proper name for given parameter
* @var string Accountancy Category label
*/
public $label;
/**
* @var mixed Sample property 1
*/
public $range_account;
/**
* @var mixed Sample property 1
*/
public $sens;
/**
* @var mixed Sample property 1
*/
public $category_type;
/**
* @var mixed Sample property 1
*/
public $formula;
/**
* @var mixed Sample property 1
*/
public $position;
/**
* @var mixed Sample property 1
*/
public $fk_country;
/**
* @var mixed Sample property 1
*/
public $active;
/**
* @var mixed Sample property 1
*/
public $lines_cptbk;
/**
* @var mixed Sample property 1
*/
public $lines_display;
/**
* @var mixed Sample property 1
*/
public $sdc;

10
htdocs/accountancy/class/accountancysystem.class.php
View File

@ -32,22 +32,22 @@ class AccountancySystem
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
var $rowid;
var $fk_pcg_version;
var $pcg_type;
var $pcg_subtype;
/**
* @var string proper name for given parameter
* @var string Accountancy System label
*/
public $label;
var $account_number;
var $account_parent;

25
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -37,6 +37,9 @@ class AccountingAccount extends CommonObject
*/
public $table_element='accounting_account';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'billr';
/**
@ -71,14 +74,19 @@ class AccountingAccount extends CommonObject
*/
public $id;
var $rowid;
var $datec; // Creation date
var $fk_pcg_version;
var $pcg_type;
var $pcg_subtype;
var $account_number;
var $account_parent;
var $account_category;
/**
* @var int ID
*/
public $rowid;
public $datec; // Creation date
public $fk_pcg_version;
public $pcg_type;
public $pcg_subtype;
public $account_number;
public $account_parent;
public $account_category;
public $status;
/**
* @var string Label of account
@ -96,7 +104,6 @@ class AccountingAccount extends CommonObject
public $fk_user_modif;
public $active; // duplicate with status
public $status;
/**

13
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -36,16 +36,27 @@ class AccountingJournal extends CommonObject
*/
public $table_element='accounting_journal';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'generic';
/**
* @var int ID
*/
public $rowid;
public $code;
/**
* @var string proper name for given parameter
* @var string Accounting Journal label
*/
public $label;

16
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -35,22 +35,25 @@ class BookKeeping extends CommonObject
* @var string Error code (or message)
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**
* @var string Id to identify managed objects
*/
public $element = 'accountingbookkeeping';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'accounting_bookkeeping';
/**
* @var int Entity
*/
public $entity;
/**
@ -62,8 +65,7 @@ class BookKeeping extends CommonObject
* @var int ID
*/
public $id;
/**
*/
public $doc_date;
public $date_lim_reglement;
public $doc_type;
@ -1862,7 +1864,11 @@ class BookKeeping extends CommonObject
*/
class BookKeepingLine
{
/**
* @var int ID
*/
public $id;
public $doc_date = '';
public $doc_type;
public $doc_ref;

92
htdocs/adherents/class/adherent.class.php
View File

@ -53,67 +53,73 @@ class Adherent extends CommonObject
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $mesgs;
public $mesgs;
var $login;
public $login;
//! Clear password in memory
var $pass;
public $pass;
//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
var $pass_indatabase;
public $pass_indatabase;
//! Encrypted password in database (always defined)
var $pass_indatabase_crypted;
public $pass_indatabase_crypted;
var $societe;
var $company;
var $address;
var $zip;
var $town;
public $societe;
public $company;
public $address;
public $zip;
public $town;
var $state_id; // Id of department
var $state_code; // Code of department
var $state; // Label of department
public $state_id; // Id of department
public $state_code; // Code of department
public $state; // Label of department
var $email;
var $skype;
var $phone;
var $phone_perso;
var $phone_mobile;
public $email;
public $skype;
public $phone;
public $phone_perso;
public $phone_mobile;
var $morphy;
var $public;
var $statut; // -1:brouillon, 0:resilie, >=1:valide,paye
var $photo;
public $morphy;
public $public;
public $statut; // -1:brouillon, 0:resilie, >=1:valide,paye
public $photo;
var $datec;
var $datem;
var $datefin;
var $datevalid;
var $birth;
public $datec;
public $datem;
public $datefin;
public $datevalid;
public $birth;
var $note_public;
var $note_private;
public $note_public;
public $note_private;
var $typeid; // Id type adherent
var $type; // Libelle type adherent
var $need_subscription;
public $typeid; // Id type adherent
public $type; // Libelle type adherent
public $need_subscription;
var $user_id;
var $user_login;
public $user_id;
public $user_login;
var $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
// Fields loaded by fetch_subscriptions()
var $first_subscription_date;
var $first_subscription_amount;
var $last_subscription_date;
var $last_subscription_date_start;
var $last_subscription_date_end;
var $last_subscription_amount;
var $subscriptions=array();
public $first_subscription_date;
public $first_subscription_amount;
public $last_subscription_date;
public $last_subscription_date_start;
public $last_subscription_date_end;
public $last_subscription_amount;
public $subscriptions=array();
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
/**
* @var int Entity
*/
public $entity;
/**

14
htdocs/adherents/class/adherent_type.class.php
View File

@ -36,13 +36,17 @@ class AdherentType extends CommonObject
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'adherent_type';
/**
* @var string ID to identify managed object
*/
public $element = 'adherent_type';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
@ -51,19 +55,25 @@ class AdherentType extends CommonObject
* @see label
*/
public $libelle;
/** @var string Label */
public $label;
/**
* @var int Subsription required (0 or 1)
* @since 5.0
*/
public $subscription;
/** @var string Public note */
public $note;
/** @var integer Can vote */
public $vote;
/** @var string Email sent during validation */
public $mail_valid;
/** @var array Array of members */
public $members=array();

23
htdocs/adherents/class/subscription.class.php
View File

@ -36,21 +36,24 @@ class Subscription extends CommonObject
* @var string ID to identify managed object
*/
public $element='subscription';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='subscription';
public $picto='payment';
var $datec; // Date creation
var $datem; // Date modification
var $dateh; // Subscription start date (date subscription)
var $datef; // Subscription end date
var $fk_adherent;
var $amount;
var $fk_bank;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment';
public $datec; // Date creation
public $datem; // Date modification
public $dateh; // Subscription start date (date subscription)
public $datef; // Subscription end date
public $fk_adherent;
public $amount;
public $fk_bank;
/**

24
htdocs/asset/class/asset.class.php
View File

@ -95,18 +95,36 @@ class Asset extends CommonObject
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Active', '-1'=>'Cancel')),
);
/**
* @var int ID
*/
public $rowid;
/**
* @var string Ref
*/
public $ref;
public $entity;
/**
* @var string proper name for given parameter
* @var string Asset label
*/
public $label;
public $label;
public $amount;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
/**
* @var string description
*/
public $description;
public $note_public;
public $note_private;
public $date_creation;

13
htdocs/asset/class/asset_type.class.php
View File

@ -33,25 +33,34 @@ class AssetType extends CommonObject
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'asset_type';
/**
* @var string ID to identify managed object
*/
public $element = 'asset_type';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'group';
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 Accountancy code asset */
public $accountancy_code_asset;
/** @var string Accountancy code depreciation asset */
public $accountancy_code_depreciation_asset;
/** @var string Accountancy code depreciation expense */
public $accountancy_code_depreciation_expense;
/** @var string Public note */
public $note;
/** @var array Array of asset */
public $asset=array();

3
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -39,6 +39,7 @@ class BlockedLog
* @var int
*/
public $id;
/**
* Entity
* @var int
@ -46,7 +47,7 @@ class BlockedLog
public $entity;
public $error = '';
/**
* @var string[] Error codes (or messages)
*/

30
htdocs/bookmarks/class/bookmark.class.php
View File

@ -32,14 +32,18 @@ class Bookmark extends CommonObject
* @var string ID to identify managed object
*/
public $element='bookmark';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='bookmark';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'bookmark';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bookmark';
/**
* @var DoliDB Database handler.
@ -50,14 +54,18 @@ class Bookmark extends CommonObject
* @var int ID
*/
public $id;
var $fk_user;
var $datec;
var $url;
var $target; // 0=replace, 1=new window
var $title;
var $position;
var $favicon;
/**
* @var int User ID
*/
public $fk_user;
public $datec;
public $url;
public $target; // 0=replace, 1=new window
public $title;
public $position;
public $favicon;
/**

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

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

13
htdocs/categories/class/categorie.class.php
View File

@ -51,8 +51,11 @@ class Categorie extends CommonObject
const TYPE_USER = 'user';
const TYPE_PROJECT = 'project';
const TYPE_ACCOUNT = 'bank_account';
const TYPE_BANK_LINE = 'bank_line';
const TYPE_BANK_LINE = 'bank_line';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'category';
@ -161,11 +164,15 @@ class Categorie extends CommonObject
public $fk_parent;
/**
* @var string proper name for given parameter
* @var string Category label
*/
public $label;
public $label;
/**
* @var string description
*/
public $description;
/**
* @var string Color
*/

16
htdocs/comm/action/class/actioncomm.class.php
View File

@ -38,21 +38,25 @@ class ActionComm extends CommonObject
* @var string ID to identify managed object
*/
public $element='action';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'actioncomm';
public $table_rowid = 'id';
public $picto='action';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='action';
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user, 2=Same than 1 but accept record if fksoc is empty
* @var integer
@ -78,7 +82,7 @@ class ActionComm extends CommonObject
var $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
/**
* @var string proper name for given parameter
* @var string Agenda event label
*/
public $label;

11
htdocs/comm/action/class/actioncommreminder.class.php
View File

@ -34,17 +34,17 @@ class ActionCommReminder extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'actioncomm_reminder';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'actioncomm_reminder';
/**
* @var array Does actioncommreminder support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 0;
/**
* @var string String with name of icon for actioncommreminder. Must be the part after the 'object_' into object_actioncommreminder.png
*/
@ -84,7 +84,12 @@ class ActionCommReminder extends CommonObject
public $rowid;
public $dateremind;
public $typeremind;
/**
* @var int User ID
*/
public $fk_user;
public $offsetvalue;
public $offsetunit;
public $status;

26
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -32,7 +32,7 @@ class CActionComm
* @var string Error code (or message)
*/
public $error='';
/**
* @var DoliDB Database handler.
*/
@ -43,20 +43,24 @@ class CActionComm
*/
public $id;
var $code;
var $type;
var $libelle; // deprecated
public $code;
public $type;
public $libelle; // deprecated
/**
* @var string proper name for given parameter
* @var string Type of agenda event label
*/
public $label;
var $active;
var $color;
var $picto;
var $type_actions=array();
public $active;
public $color;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto;
public $type_actions=array();
/**

45
htdocs/comm/mailing/class/mailing.class.php
View File

@ -35,39 +35,42 @@ class Mailing extends CommonObject
* @var string ID to identify managed object
*/
public $element='mailing';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='mailing';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='email';
var $titre;
var $sujet;
var $body;
var $nbemail;
var $bgcolor;
var $bgimage;
public $titre;
public $sujet;
public $body;
public $nbemail;
public $bgcolor;
public $bgimage;
var $statut; // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
public $statut; // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
var $email_from;
var $email_replyto;
var $email_errorsto;
public $email_from;
public $email_replyto;
public $email_errorsto;
var $joined_file1;
var $joined_file2;
var $joined_file3;
var $joined_file4;
public $joined_file1;
public $joined_file2;
public $joined_file3;
public $joined_file4;
var $user_creat;
var $user_valid;
public $user_creat;
public $user_valid;
var $date_creat;
var $date_valid;
public $date_creat;
public $date_valid;
var $extraparams=array();
public $extraparams=array();
public $statut_dest=array();
public $statuts=array();

13
htdocs/comm/propal/class/propal.class.php
View File

@ -55,8 +55,19 @@ class Propal extends CommonObject
*/
public $table_element='propal';
/**
* @var int Name of subtable line
*/
public $table_element_line='propaldet';
public $fk_element='fk_propal';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element ='fk_propal';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='propal';
/**

20
htdocs/commande/class/commande.class.php
View File

@ -52,15 +52,26 @@ class Commande extends CommonOrder
*/
public $table_element='commande';
/**
* @var int Name of subtable line
*/
public $table_element_line = 'commandedet';
public $class_element_line = 'OrderLine';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_commande';
public $picto = 'order';
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer
@ -87,6 +98,7 @@ class Commande extends CommonOrder
* @var int
*/
public $statut;
/**
* Billed
* @var int
@ -109,21 +121,25 @@ class Commande extends CommonOrder
* @var int
*/
public $mode_reglement_id;
/**
* Payment mode code
* @var string
*/
public $mode_reglement_code;
/**
* Availability delivery time id
* @var int
*/
public $availability_id;
/**
* Availability delivery time code
* @var string
*/
public $availability_code;
/**
* Label of availability delivery time. Use it in case translation cannot be found.
* @var string
@ -133,11 +149,13 @@ class Commande extends CommonOrder
public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
public $demand_reason_code;
public $date; // Date commande
/**
* @deprecated
* @see date
*/
public $date_commande;
public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
public $fk_remise_except;
public $remise_percent;
@ -3832,7 +3850,7 @@ class OrderLine extends CommonOrderLine
var $fk_facture;
/**
* @var string proper name for given parameter
* @var string Order lines label
*/
public $label;

58
htdocs/compta/bank/class/account.class.php
View File

@ -40,12 +40,12 @@ class Account extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'bank_account';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'bank_account';
public $picto = 'account';
/**
@ -1648,56 +1648,60 @@ class AccountLine extends CommonObject
* @var string Error code (or message)
*/
public $error='';
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string ID to identify managed object
*/
public $element='bank';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='bank';
var $picto = 'generic';
public $picto = 'generic';
/**
* @var int ID
*/
public $id;
var $ref;
var $datec;
var $dateo;
/**
* @var string Ref
*/
public $ref;
public $datec;
public $dateo;
/**
* Value date
*/
var $datev;
var $amount;
public $datev;
public $amount;
/**
* @var string proper name for given parameter
* @var string bank transaction lines label
*/
public $label;
var $note;
var $fk_user_author;
var $fk_user_rappro;
var $fk_type;
var $rappro; // Is it conciliated
var $num_releve; // If conciliated, what is bank statement
var $num_chq; // Num of cheque
var $bank_chq; // Bank of cheque
var $fk_bordereau; // Id of cheque receipt
var $fk_account; // Id of bank account
var $bank_account_label; // Label of bank account
public $note;
public $fk_user_author;
public $fk_user_rappro;
public $fk_type;
public $rappro; // Is it conciliated
public $num_releve; // If conciliated, what is bank statement
public $num_chq; // Num of cheque
public $bank_chq; // Bank of cheque
public $fk_bordereau; // Id of cheque receipt
public $fk_account; // Id of bank account
public $bank_account_label; // Label of bank account
public $emetteur;

7
htdocs/compta/bank/class/bankcateg.class.php
View File

@ -32,10 +32,13 @@ class BankCateg // extends CommonObject
//public $table_element='bank_categ'; //!< Name of table without prefix where object is stored
public $picto='generic';
public $id;
/**
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string bank categories label
*/
public $label;

42
htdocs/compta/bank/class/paymentvarious.class.php
View File

@ -34,38 +34,42 @@ class PaymentVarious extends CommonObject
* @var string ID to identify managed object
*/
public $element='variouspayment';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='payment_various';
public $picto = 'bill';
/**
* @var int ID
*/
public $id;
var $ref;
var $tms;
var $datep;
var $datev;
var $sens;
var $amount;
var $type_payment;
var $num_payment;
/**
* @var string proper name for given parameter
* @var string Ref
*/
public $ref;
public $tms;
public $datep;
public $datev;
public $sens;
public $amount;
public $type_payment;
public $num_payment;
/**
* @var string various payments label
*/
public $label;
var $accountancy_code;
var $fk_project;
var $fk_bank;
var $fk_user_author;
var $fk_user_modif;
public $accountancy_code;
public $fk_project;
public $fk_bank;
public $fk_user_author;
public $fk_user_modif;
/**

37
htdocs/compta/deplacement/class/deplacement.class.php
View File

@ -35,27 +35,40 @@ class Deplacement extends CommonObject
* @var string ID to identify managed object
*/
public $element='deplacement';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='deplacement';
/**
* @var int Name of subtable line
*/
public $table_element_line = '';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $datec; // Creation date
var $dated;
var $fk_user_author;
var $fk_user;
var $km;
var $socid;
var $statut; // 0=draft, 1=validated
var $extraparams=array();
public $datec; // Creation date
public $dated;
public $fk_user_author;
var $statuts=array();
var $statuts_short=array();
/**
* @var int User ID
*/
public $fk_user;
public $km;
public $socid;
public $statut; // 0=draft, 1=validated
public $extraparams=array();
public $statuts=array();
public $statuts_short=array();
/**
* Constructor

52
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -43,40 +43,48 @@ class FactureRec extends CommonInvoice
* @var string ID to identify managed object
*/
public $element='facturerec';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='facture_rec';
/**
* @var int Name of subtable line
*/
public $table_element_line='facturedet_rec';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_facture';
public $picto='bill';
var $entity;
var $number;
var $date;
var $amount;
var $remise;
var $tva;
var $total;
var $db_table;
var $propalid;
public $entity;
public $number;
public $date;
public $amount;
public $remise;
public $tva;
public $total;
public $db_table;
public $propalid;
var $date_last_gen;
var $date_when;
var $nb_gen_done;
var $nb_gen_max;
public $date_last_gen;
public $date_when;
public $nb_gen_done;
public $nb_gen_max;
var $frequency;
var $unit_frequency;
public $frequency;
public $unit_frequency;
var $rang;
var $special_code;
public $rang;
public $special_code;
var $usenewprice=0;
public $usenewprice=0;
var $suspended; // status
public $suspended; // status
const STATUS_NOTSUSPENDED = 0;
const STATUS_SUSPENDED = 1;
@ -1653,7 +1661,7 @@ class FactureLigneRec extends CommonInvoiceLine
* @var string ID to identify managed object
*/
public $element='facturedetrec';
/**
* @var string Name of table without prefix where object is stored
*/

13
htdocs/compta/facture/class/facture.class.php
View File

@ -63,14 +63,24 @@ class Facture extends CommonInvoice
*/
public $table_element='facture';
/**
* @var int Name of subtable line
*/
public $table_element_line = 'facturedet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_facture';
public $picto='bill';
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer
@ -120,14 +130,17 @@ class Facture extends CommonInvoice
public $cond_reglement_code; // Code in llx_c_paiement
public $mode_reglement_code; // Code in llx_c_paiement
public $fk_bank; // Field to store bank id to use when payment mode is withdraw
/**
* @deprecated
*/
public $products=array();
/**
* @var FactureLigne[]
*/
public $lines=array();
public $line;
public $extraparams=array();
public $specimen;

22
htdocs/compta/facture/class/paymentterm.class.php
View File

@ -32,7 +32,7 @@ class PaymentTerm // extends CommonObject
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -42,24 +42,24 @@ class PaymentTerm // extends CommonObject
* @var string[] Error codes (or messages)
*/
public $errors = array();
//public $element='c_payment_term'; //!< Id that identify managed objects
//public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored
var $context =array();
public $context =array();
/**
* @var int ID
*/
public $id;
var $code;
var $sortorder;
var $active;
var $libelle;
var $libelle_facture;
var $type_cdr;
var $nbjour;
var $decalage;
public $code;
public $sortorder;
public $active;
public $libelle;
public $libelle_facture;
public $type_cdr;
public $nbjour;
public $decalage;

2
htdocs/compta/localtax/class/localtax.class.php
View File

@ -48,7 +48,7 @@ class Localtax extends CommonObject
var $amount;
/**
* @var string proper name for given parameter
* @var string local tax
*/
public $label;

8
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -37,12 +37,12 @@ class RemiseCheque extends CommonObject
* @var string ID to identify managed object
*/
public $element='chequereceipt';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='bordereau_cheque';
public $picto = 'payment';
var $num;
@ -56,6 +56,10 @@ class RemiseCheque extends CommonObject
public $account_label;
public $author_id;
public $nbcheque;
/**
* @var string Ref
*/
public $ref;
/**

7
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -44,7 +44,12 @@ class PaymentSalary extends CommonObject
public $picto='payment';
public $tms;
/**
* @var int User ID
*/
public $fk_user;
public $datep;
public $datev;
public $amount;
@ -53,7 +58,7 @@ class PaymentSalary extends CommonObject
public $num_payment;
/**
* @var string proper name for given parameter
* @var string salary payments label
*/
public $label;

10
htdocs/compta/tva/class/tva.class.php
View File

@ -37,12 +37,12 @@ class Tva extends CommonObject
* @var string ID to identify managed object
*/
public $element='tva';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='tva';
public $picto='payment';
var $tms;
@ -51,12 +51,12 @@ class Tva extends CommonObject
var $amount;
var $type_payment;
var $num_payment;
/**
* @var string proper name for given parameter
* @var string label
*/
public $label;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;

133
htdocs/contrat/class/contrat.class.php
View File

@ -51,8 +51,16 @@ class Contrat extends CommonObject
*/
public $table_element='contrat';
/**
* @var int Name of subtable line
*/
public $table_element_line='contratdet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_contrat';
public $picto='contract';
/**
@ -76,27 +84,29 @@ class Contrat extends CommonObject
* Customer reference of the contract
* @var string
*/
var $ref_customer;
public $ref_customer;
/**
* Supplier reference of the contract
* @var string
*/
var $ref_supplier;
public $ref_supplier;
/**
* Client id linked to the contract
* @var int
*/
var $socid;
var $societe; // Objet societe
public $socid;
public $societe; // Objet societe
/**
* Status of the contract
* @var int
*/
var $statut=0; // 0=Draft,
var $product;
public $statut=0; // 0=Draft,
public $product;
/**
* @var int Id of user author of the contract
@ -123,7 +133,7 @@ class Contrat extends CommonObject
/**
* @var int Date of creation
*/
var $date_creation;
public $date_creation;
/**
* @var int Date of last modification. Not filled until you call ->info()
@ -133,34 +143,34 @@ class Contrat extends CommonObject
/**
* @var int Date of validation
*/
var $date_validation;
public $date_validation;
/**
* @var int Date when contract was signed
*/
var $date_contrat;
public $date_contrat;
/**
* @var int Date of contract closure
* @deprecated we close contract lines, not a contract
*/
var $date_cloture;
public $date_cloture;
var $commercial_signature_id;
var $commercial_suivi_id;
public $commercial_signature_id;
public $commercial_suivi_id;
/**
* @deprecated Use fk_project instead
* @see fk_project
*/
var $fk_projet;
public $fk_projet;
var $extraparams=array();
public $extraparams=array();
/**
* @var ContratLigne[] Contract lines
*/
var $lines=array();
public $lines=array();
/**
* Maps ContratLigne IDs to $this->lines indexes
@ -2482,51 +2492,60 @@ class ContratLigne extends CommonObjectLine
*/
public $id;
var $ref;
var $tms;
/**
* @var string Ref
*/
public $ref;
public $tms;
public $fk_contrat;
public $fk_product;
public $statut; // 0 inactive, 4 active, 5 closed
public $type; // 0 for product, 1 for service
var $fk_contrat;
var $fk_product;
var $statut; // 0 inactive, 4 active, 5 closed
var $type; // 0 for product, 1 for service
/**
* @var string
* @deprecated
*/
var $label;
public $label;
/**
* @var string
* @deprecated
*/
public $libelle;
var $description;
/**
* @var string description
*/
public $description;
var $product_ref;
var $product_label;
public $product_ref;
public $product_label;
var $date_commande;
public $date_commande;
var $date_start; // date start planned
var $date_start_real; // date start real
var $date_end; // date end planned
var $date_end_real; // date end real
public $date_start; // date start planned
public $date_start_real; // date start real
public $date_end; // date end planned
public $date_end_real; // date end real
// For backward compatibility
var $date_ouverture_prevue; // date start planned
var $date_ouverture; // date start real
var $date_fin_validite; // date end planned
var $date_cloture; // date end real
var $tva_tx;
var $localtax1_tx;
var $localtax2_tx;
var $localtax1_type; // Local tax 1 type
var $localtax2_type; // Local tax 2 type
var $qty;
var $remise_percent;
var $remise;
var $fk_remise_except;
public $date_ouverture_prevue; // date start planned
public $date_ouverture; // date start real
public $date_fin_validite; // date end planned
public $date_cloture; // date end real
public $tva_tx;
public $localtax1_tx;
public $localtax2_tx;
public $localtax1_type; // Local tax 1 type
public $localtax2_type; // Local tax 2 type
public $qty;
public $remise_percent;
public $remise;
public $fk_remise_except;
var $subprice; // Unit price HT
public $subprice; // Unit price HT
/**
* @var float
@ -2535,22 +2554,22 @@ class ContratLigne extends CommonObjectLine
*/
public $price;
var $price_ht;
public $price_ht;
var $total_ht;
var $total_tva;
var $total_localtax1;
var $total_localtax2;
var $total_ttc;
public $total_ht;
public $total_tva;
public $total_localtax1;
public $total_localtax2;
public $total_ttc;
var $fk_fournprice;
var $pa_ht;
public $fk_fournprice;
public $pa_ht;
var $info_bits;
var $fk_user_author;
var $fk_user_ouverture;
var $fk_user_cloture;
var $commentaire;
public $info_bits;
public $fk_user_author;
public $fk_user_ouverture;
public $fk_user_cloture;
public $commentaire;
const STATUS_INITIAL = 0;
const STATUS_OPEN = 4;

18
htdocs/core/class/ccountry.class.php
View File

@ -36,7 +36,7 @@ class Ccountry // extends CommonObject
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -46,7 +46,7 @@ class Ccountry // extends CommonObject
* @var string[] Error codes (or messages)
*/
public $errors = array();
//var $element='ccountry'; //!< Id that identify managed objects
//var $table_element='ccountry'; //!< Name of table without prefix where object is stored
@ -54,16 +54,16 @@ class Ccountry // extends CommonObject
* @var int ID
*/
public $id;
var $code;
var $code_iso;
public $code;
public $code_iso;
/**
* @var string proper name for given parameter
* @var string Countries label
*/
public $label;
var $active;
public $active;

12
htdocs/core/class/comment.class.php
View File

@ -31,9 +31,16 @@ class Comment extends CommonObject
*/
public $table_element='comment';
public $fk_element;
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element ='';
public $element_type;
/**
* @var string description
*/
public $description;
public $tms;
@ -42,6 +49,9 @@ class Comment extends CommonObject
public $fk_user_author;
/**
* @var int Entity
*/
public $entity;
public $import_key;

7
htdocs/core/class/commonobject.class.php
View File

@ -73,9 +73,9 @@ abstract class CommonObject
public $table_element;
/**
* @var
* @var int Name of subtable line
*/
public $table_element_line;
public $table_element_line='';
/**
* @var string Key value used to track if data is coming from import wizard
@ -168,6 +168,7 @@ abstract class CommonObject
* @see fetch_origin()
*/
public $origin;
/**
* @var int The id of originating object
* @see fetch_origin()
@ -6175,7 +6176,7 @@ abstract class CommonObject
{
//Show only the key field in params
if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;
$enabled = 1;
if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
{

12
htdocs/core/class/cstate.class.php
View File

@ -36,7 +36,7 @@ class Cstate // extends CommonObject
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -46,7 +46,7 @@ class Cstate // extends CommonObject
* @var string[] Error codes (or messages)
*/
public $errors = array();
//var $element='cstate'; //!< Id that identify managed objects
//var $table_element='cstate'; //!< Name of table without prefix where object is stored
@ -54,10 +54,10 @@ class Cstate // extends CommonObject
* @var int ID
*/
public $id;
var $code_departement;
var $nom;
var $active;
public $code_departement;
public $nom;
public $active;

14
htdocs/core/class/ctypent.class.php
View File

@ -31,7 +31,7 @@ class Ctypent // extends CommonObject
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -41,7 +41,7 @@ class Ctypent // extends CommonObject
* @var string[] Error codes (or messages)
*/
public $errors = array();
//var $element='ctypent'; //!< Id that identify managed objects
//var $table_element='ctypent'; //!< Name of table without prefix where object is stored
@ -49,11 +49,11 @@ class Ctypent // extends CommonObject
* @var int ID
*/
public $id;
var $code;
var $libelle;
var $active;
var $module;
public $code;
public $libelle;
public $active;
public $module;

4
htdocs/core/class/ctyperesource.class.php
View File

@ -50,7 +50,7 @@ class Ctyperesource
public $code;
/**
* @var string proper name for given parameter
* @var string Type resource label
*/
public $label;
@ -486,7 +486,7 @@ class CtyperesourceLine
public $code;
/**
* @var string proper name for given parameter
* @var string Type resource line label
*/
public $label;

25
htdocs/core/class/discount.class.php
View File

@ -32,7 +32,7 @@ class DiscountAbsolute
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -43,15 +43,32 @@ class DiscountAbsolute
*/
public $errors=array();
public $id; // Id discount
/**
* @var int ID discount
*/
public $id;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $discount_type; // 0 => customer discount, 1 => supplier discount
public $amount_ht; //
public $amount_tva; //
public $amount_ttc; //
public $tva_tx; // Vat rate
public $fk_user; // Id utilisateur qui accorde la remise
public $description; // Description libre
/**
* @var int User ID Id utilisateur qui accorde la remise
*/
public $fk_user;
/**
* @var string description
*/
public $description;
public $datec; // Date creation
public $fk_facture_line; // Id invoice line when a discount is used into an invoice line (for absolute discounts)
public $fk_facture; // Id invoice when a discount line is used into an invoice (for credit note)

15
htdocs/core/class/emailsenderprofile.class.php
View File

@ -39,17 +39,17 @@ class EmailSenderProfile extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'emailsenderprofile';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'c_email_senderprofile';
/**
* @var array Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for emailsenderprofile
*/
@ -88,8 +88,17 @@ class EmailSenderProfile extends CommonObject
'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
);
/**
* @var int ID
*/
public $rowid;
/**
* @var int Entity
*/
public $entity;
public $label;
public $email;
public $date_creation;

6
htdocs/core/class/events.class.php
View File

@ -63,7 +63,11 @@ class Events // extends CommonObject
var $type;
var $entity;
var $dateevent;
var $description;
/**
* @var string description
*/
public $description;
// List of all Audit/Security events supported by triggers
var $eventstolog=array(

35
htdocs/core/class/fiscalyear.class.php
View File

@ -38,25 +38,36 @@ class Fiscalyear extends CommonObject
*/
public $table_element='accounting_fiscalyear';
/**
* @var int Name of subtable line
*/
public $table_element_line = '';
public $fk_element = '';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $rowid;
/**
* @var string proper name for given parameter
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = '';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* @var int ID
*/
public $rowid;
/**
* @var string fiscal year label
*/
public $label;
var $date_start;
var $date_end;
var $datec;
var $statut; // 0=open, 1=closed
var $entity;
public $date_start;
public $date_end;
public $datec;
public $statut; // 0=open, 1=closed
public $entity;
var $statuts=array();
var $statuts_short=array();
public $statuts=array();
public $statuts_short=array();
/**
* Constructor

5
htdocs/core/class/html.formmail.class.php
View File

@ -1402,10 +1402,13 @@ class FormMail extends Form
*/
class ModelMail
{
/**
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string Model mail label
*/
public $label;

14
htdocs/core/class/link.class.php
View File

@ -32,21 +32,25 @@ class Link extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'link';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'links';
public $entity;
/**
* @var int Entity
*/
public $entity;
public $datea;
public $url;
/**
* @var string proper name for given parameter
* @var string Links label
*/
public $label;
public $objecttype;
public $objectid;

5
htdocs/core/class/menubase.class.php
View File

@ -43,7 +43,10 @@ class Menubase
*/
public $errors = array();
public $id;
/**
* @var int ID
*/
public $id;
public $menu_handler;
public $module;

11
htdocs/core/class/notify.class.php
View File

@ -34,12 +34,12 @@ class Notify
* @var int ID
*/
public $id;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -51,7 +51,12 @@ class Notify
public $errors = array();
var $author;
var $ref;
/**
* @var string Ref
*/
public $ref;
var $date;
var $duree;
var $note;

8
htdocs/core/modules/action/rapport.pdf.php
View File

@ -39,8 +39,12 @@ class CommActionRapport
* @var DoliDB Database handler.
*/
public $db;
var $description;
/**
* @var string description
*/
public $description;
var $date_edition;
var $year;
var $month;

18
htdocs/core/modules/export/export_csv.modules.php
View File

@ -34,21 +34,21 @@ class ExportCsv extends ModeleExports
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string export files label
*/
public $label;
var $extension;
var $version;
var $label_lib;
var $version_lib;
public $extension;
public $version;
var $separator;
public $label_lib;
public $version_lib;
var $handle; // Handle fichier
public $separator;
public $handle; // Handle fichier
/**

24
htdocs/core/modules/export/export_excel.modules.php
View File

@ -36,23 +36,23 @@ class ExportExcel extends ModeleExports
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string Export Excel label
*/
public $label;
var $extension;
var $version;
var $label_lib;
var $version_lib;
public $extension;
public $version;
var $workbook; // Handle fichier
var $worksheet; // Handle onglet
var $row;
var $col;
var $file; // To save filename
public $label_lib;
public $version_lib;
public $workbook; // Handle fichier
public $worksheet; // Handle onglet
public $row;
public $col;
public $file; // To save filename
/**

24
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -37,23 +37,23 @@ class ExportExcel2007 extends ExportExcel
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string label
*/
public $label;
var $extension;
var $version;
var $label_lib;
var $version_lib;
public $extension;
public $version;
var $workbook; // Handle fichier
var $worksheet; // Handle onglet
var $row;
var $col;
var $file; // To save filename
public $label_lib;
public $version_lib;
public $workbook; // Handle fichier
public $worksheet; // Handle onglet
public $row;
public $col;
public $file; // To save filename
/**
* Constructor

18
htdocs/core/modules/export/export_tsv.modules.php
View File

@ -35,21 +35,21 @@ class ExportTsv extends ModeleExports
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string label
*/
public $label;
var $extension;
var $version;
var $label_lib;
var $version_lib;
public $extension;
public $version;
var $separator="\t";
public $label_lib;
public $version_lib;
var $handle; // Handle fichier
public $separator="\t";
public $handle; // Handle fichier
/**

32
htdocs/core/modules/import/import_csv.modules.php
View File

@ -37,14 +37,14 @@ class ImportCsv extends ModeleImports
* @var DoliDB Database handler.
*/
public $db;
var $datatoimport;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
*/
@ -54,28 +54,28 @@ class ImportCsv extends ModeleImports
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string label
*/
public $label;
var $extension; // Extension of files imported by driver
var $version; // Version of driver
var $label_lib; // Label of external lib used by driver
var $version_lib; // Version of external lib used by driver
public $extension; // Extension of files imported by driver
public $version; // Version of driver
var $separator;
public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver
var $file; // Path of file
var $handle; // Handle fichier
public $separator;
var $cacheconvert=array(); // Array to cache list of value found after a convertion
var $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $file; // Path of file
public $handle; // Handle fichier
var $nbinsert = 0; // # of insert done during the import
var $nbupdate = 0; // # of update done during the import
public $cacheconvert=array(); // Array to cache list of value found after a convertion
public $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $nbinsert = 0; // # of insert done during the import
public $nbupdate = 0; // # of update done during the import
/**

34
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -37,14 +37,14 @@ class ImportXlsx extends ModeleImports
* @var DoliDB Database handler.
*/
public $db;
var $datatoimport;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
*/
@ -54,29 +54,29 @@ class ImportXlsx extends ModeleImports
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
* @var string label
*/
public $label;
var $extension; // Extension of files imported by driver
var $version; // Version of driver
var $label_lib; // Label of external lib used by driver
var $version_lib; // Version of external lib used by driver
public $extension; // Extension of files imported by driver
public $version; // Version of driver
var $separator;
public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver
var $file; // Path of file
var $handle; // Handle fichier
public $separator;
var $cacheconvert=array(); // Array to cache list of value found after a convertion
var $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $file; // Path of file
public $handle; // Handle fichier
var $workbook; // temporary import file
var $record; // current record
var $headers;
public $cacheconvert=array(); // Array to cache list of value found after a convertion
public $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $workbook; // temporary import file
public $record; // current record
public $headers;
/**

2
htdocs/core/modules/import/modules_import.php
View File

@ -45,7 +45,7 @@ class ModeleImports
public $id;
/**
* @var string proper name for given parameter
* @var string label
*/
public $label;

12
htdocs/core/modules/security/generate/modGeneratePassNone.class.php
View File

@ -35,17 +35,17 @@ class modGeneratePassNone extends ModeleGenPassword
* @var int ID
*/
public $id;
var $length;
public $length;
/**
* @var DoliDB Database handler.
*/
public $db;
var $conf;
var $lang;
var $user;
public $conf;
public $lang;
public $user;
/**

36
htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
View File

@ -37,30 +37,30 @@ class modGeneratePassPerso extends ModeleGenPassword
* @var int ID
*/
public $id;
var $length;
var $length2; // didn't overright display
var $NbMaj;
var $NbNum;
var $NbSpe;
var $NbRepeat;
var $WithoutAmbi;
public $length;
public $length2; // didn't overright display
public $NbMaj;
public $NbNum;
public $NbSpe;
public $NbRepeat;
public $WithoutAmbi;
/**
* @var DoliDB Database handler.
*/
public $db;
var $conf;
var $lang;
var $user;
var $Maj;
var $Min;
var $Nb;
var $Spe;
var $Ambi;
var $All;
public $conf;
public $lang;
public $user;
public $Maj;
public $Min;
public $Nb;
public $Spe;
public $Ambi;
public $All;
/**
* Constructor

12
htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
View File

@ -35,17 +35,17 @@ class modGeneratePassStandard extends ModeleGenPassword
* @var int ID
*/
public $id;
var $length;
public $length;
/**
* @var DoliDB Database handler.
*/
public $db;
var $conf;
var $lang;
var $user;
public $conf;
public $lang;
public $user;
/**

13
htdocs/cron/class/cronjob.class.php
View File

@ -42,7 +42,11 @@ class Cronjob extends CommonObject
public $picto = 'cron';
public $entity;
/**
* @var int Entity
*/
public $entity;
public $jobtype;
public $tms='';
public $datec='';
@ -1333,7 +1337,14 @@ class Cronjob extends CommonObject
class Cronjobline
{
/**
* @var int ID
*/
public $id;
/**
* @var string Ref
*/
public $ref;
public $tms='';

42
htdocs/don/class/don.class.php
View File

@ -38,38 +38,42 @@ class Don extends CommonObject
* @var string ID to identify managed object
*/
public $element='don';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='don';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_donation';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $picto = 'generic';
public $picto = 'generic';
var $date;
var $amount;
var $societe;
var $address;
var $zip;
var $town;
var $email;
var $public;
var $fk_project;
var $fk_typepayment;
var $num_payment;
var $date_valid;
var $modepaymentid = 0;
public $date;
public $amount;
public $societe;
public $address;
public $zip;
public $town;
public $email;
public $public;
public $fk_project;
public $fk_typepayment;
public $num_payment;
public $date_valid;
public $modepaymentid = 0;
var $labelstatut;
var $labelstatutshort;
public $labelstatut;
public $labelstatutshort;
/**
* @deprecated
* @see note_private, note_public
*/
var $commentaire;
public $commentaire;
/**

3
htdocs/don/class/paymentdonation.class.php
View File

@ -41,6 +41,9 @@ class PaymentDonation extends CommonObject
public $picto = 'payment';
/**
* @var int ID
*/
public $rowid;
public $fk_donation;

39
htdocs/ecm/class/ecmdirectory.class.php
View File

@ -31,13 +31,13 @@ class EcmDirectory // extends CommonObject
* @var string ID to identify managed object
*/
public $element='ecm_directories';
/**
* @var string Name of table without prefix where object is stored
*/
//public $table_element='ecm_directories';
var $picto = 'dir';
public $picto = 'dir';
/**
* @var int ID
@ -45,24 +45,33 @@ class EcmDirectory // extends CommonObject
public $id;
/**
* @var string proper name for given parameter
* @var string ECM directories label
*/
public $label;
var $fk_parent;
var $description;
var $cachenbofdoc=-1; // By default cache initialized with value 'not calculated'
var $date_c;
var $date_m;
public $fk_parent;
/**
* @var string description
*/
public $description;
public $cachenbofdoc=-1; // By default cache initialized with value 'not calculated'
public $date_c;
public $date_m;
public $fk_user_m;
public $fk_user_c;
/**
* @var string Ref
*/
public $ref;
var $cats=array();
var $motherof=array();
public $cats=array();
public $motherof=array();
var $forbiddenchars = array('<','>',':','/','\\','?','*','|','"');
var $forbiddencharsdir = array('<','>',':','?','*','|','"');
public $forbiddenchars = array('<','>',':','/','\\','?','*','|','"');
public $forbiddencharsdir = array('<','>',':','?','*','|','"');
public $full_arbo_loaded;
@ -70,7 +79,7 @@ class EcmDirectory // extends CommonObject
* @var string Error code (or message)
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/

32
htdocs/ecm/class/ecmfiles.class.php
View File

@ -40,22 +40,36 @@ class EcmFiles extends CommonObject
* @var string Id to identify managed objects
*/
public $element = 'ecmfiles';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'ecm_files';
public $picto = 'generic';
public $ref; // hash of file path
/**
* @var string Ref hash of file path
*/
public $ref;
public $label; // hash of file content (md5_file(dol_osencode($destfull))
public $share; // hash for file sharing, empty by default (example: getRandomPassword(true))
/**
* @var int Entity
*/
public $entity;
public $filename;
public $filepath;
public $fullpath_orig;
/**
* @var string description
*/
public $description;
public $keywords;
public $cover;
public $position;
@ -68,7 +82,7 @@ class EcmFiles extends CommonObject
public $acl;
public $src_object_type;
public $src_object_id;
/**
* Constructor
@ -831,11 +845,21 @@ class EcmFiles extends CommonObject
class EcmfilesLine
{
public $label;
/**
* @var int Entity
*/
public $entity;
public $filename;
public $filepath;
public $fullpath_orig;
/**
* @var string description
*/
public $description;
public $keywords;
public $cover;
public $position;

60
htdocs/expedition/class/expedition.class.php
View File

@ -56,53 +56,61 @@ class Expedition extends CommonObject
*/
public $table_element="expedition";
/**
* @var int Name of subtable line
*/
public $table_element_line="expeditiondet";
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'sending';
var $socid;
var $ref_customer;
var $ref_int;
var $brouillon;
var $entrepot_id;
var $lines=array();
var $tracking_number;
var $tracking_url;
var $billed;
var $model_pdf;
public $socid;
public $ref_customer;
public $ref_int;
public $brouillon;
public $entrepot_id;
public $lines=array();
public $tracking_number;
public $tracking_url;
public $billed;
public $model_pdf;
var $trueWeight;
var $weight_units;
var $trueWidth;
var $width_units;
var $trueHeight;
var $height_units;
var $trueDepth;
var $depth_units;
public $trueWeight;
public $weight_units;
public $trueWidth;
public $width_units;
public $trueHeight;
public $height_units;
public $trueDepth;
public $depth_units;
// A denormalized value
var $trueSize;
public $trueSize;
public $date_delivery; // Date delivery planed
var $date_delivery; // Date delivery planed
/**
* @deprecated
* @see date_shipping
*/
var $date;
public $date;
/**
* @deprecated
* @see date_shipping
*/
var $date_expedition;
public $date_expedition;
/**
* Effective delivery date
* @var int
*/
public $date_shipping;
var $date_creation;
var $date_valid;
var $meths;
var $listmeths; // List of carriers
public $date_creation;
public $date_valid;
public $meths;
public $listmeths; // List of carriers
const STATUS_DRAFT = 0;

69
htdocs/fichinter/class/fichinter.class.php
View File

@ -39,14 +39,22 @@ class Fichinter extends CommonObject
* @var string ID to identify managed object
*/
public $element='fichinter';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='fichinter';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_fichinter';
/**
* @var int Name of subtable line
*/
public $table_element_line='fichinterdet';
public $picto = 'intervention';
/**
@ -54,36 +62,44 @@ class Fichinter extends CommonObject
*/
protected $table_ref_field = 'ref';
var $socid; // Id client
public $socid; // Id client
var $author;
var $datec;
var $datev;
var $dateo;
var $datee;
var $datet;
var $datem;
var $duration;
var $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
var $description;
var $fk_contrat = 0;
var $fk_project = 0;
var $extraparams=array();
public $author;
public $datec;
public $datev;
public $dateo;
public $datee;
public $datet;
public $datem;
public $duration;
public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
var $lines = array();
/**
* @var string description
*/
public $description;
public $fk_contrat = 0;
public $fk_project = 0;
public $extraparams=array();
public $lines = array();
/**
* Draft status
*/
const STATUS_DRAFT = 0;
/**
* Validated status
*/
const STATUS_VALIDATED = 1;
/**
* Billed
*/
const STATUS_BILLED = 2;
/**
* Closed
*/
@ -1326,29 +1342,32 @@ class FichinterLigne extends CommonObjectLine
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
// From llx_fichinterdet
var $fk_fichinter;
var $desc; // Description ligne
var $datei; // Date intervention
var $duration; // Duree de l'intervention
var $rang = 0;
public $fk_fichinter;
public $desc; // Description ligne
public $datei; // Date intervention
public $duration; // Duree de l'intervention
public $rang = 0;
/**
* @var string ID to identify managed object
*/
public $element='fichinterdet';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='fichinterdet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_fichinter';
/**

33
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -4,11 +4,11 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2016 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2010-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.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
* it under the terms of the GNU General Public License as published by
@ -50,8 +50,16 @@ class CommandeFournisseur extends CommonOrder
*/
public $table_element='commande_fournisseur';
public $table_element_line = 'commande_fournisseurdet';
public $fk_element = 'fk_commande';
/**
* @var int Name of subtable line
*/
public $table_element_line = 'commande_fournisseurdet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_commande';
public $picto='order';
/**
@ -71,7 +79,10 @@ class CommandeFournisseur extends CommonOrder
*/
protected $table_ref_field = 'ref';
public $id;
/**
* @var int ID
*/
public $id;
/**
* Supplier order reference
@ -100,17 +111,20 @@ class CommandeFournisseur extends CommonOrder
* Delivery date
*/
public $date_livraison;
public $total_ht;
public $total_tva;
public $total_localtax1; // Total Local tax 1
public $total_localtax2; // Total Local tax 2
public $total_ttc;
public $source;
/**
* @deprecated
* @see note_private, note_public
*/
public $note;
public $note_private;
public $note_public;
public $model_pdf;
@ -136,6 +150,7 @@ class CommandeFournisseur extends CommonOrder
* @var CommandeFournisseurLigne[]
*/
public $lines = array();
//Add for supplier_proposal
public $origin;
public $origin_id;
@ -153,34 +168,42 @@ class CommandeFournisseur extends CommonOrder
* Draft status
*/
const STATUS_DRAFT = 0;
/**
* Validated status
*/
const STATUS_VALIDATED = 1;
/**
* Accepted
*/
const STATUS_ACCEPTED = 2;
/**
* Order sent, shipment on process
*/
const STATUS_ORDERSENT = 3;
/**
* Received partially
*/
const STATUS_RECEIVED_PARTIALLY = 4;
/**
* Received completely
*/
const STATUS_RECEIVED_COMPLETELY = 5;
/**
* Order canceled
*/
const STATUS_CANCELED = 6;
/**
* Order canceled/never received
*/
const STATUS_CANCELED_AFTER_ORDER = 7;
/**
* Refused
*/

10
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
View File

@ -60,14 +60,22 @@ class CommandeFournisseurDispatch extends CommonObject
public $table_element='commande_fournisseur_dispatch'; //!< Name of table without prefix where object is stored
public $lines=array();
public $id;
/**
* @var int ID
*/
public $id;
public $fk_commande;
public $fk_product;
public $fk_commandefourndet;
public $qty;
public $fk_entrepot;
/**
* @var int User ID
*/
public $fk_user;
public $datec='';
public $comment;
public $status;

27
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005 Marc Barilley <marc@ocebo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2017 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Bahfir Abbes <bafbes@gmail.com>
@ -51,8 +51,16 @@ class FactureFournisseur extends CommonInvoice
*/
public $table_element='facture_fourn';
public $table_element_line='facture_fourn_det';
public $fk_element='fk_facture_fourn';
/**
* @var int Name of subtable line
*/
public $table_element_line='facture_fourn_det';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_facture_fourn';
public $picto='bill';
/**
@ -72,8 +80,16 @@ class FactureFournisseur extends CommonInvoice
*/
protected $table_ref_field = 'ref';
public $rowid;
public $ref;
/**
* @var int ID
*/
public $rowid;
/**
* @var string Ref
*/
public $ref;
public $product_ref;
public $ref_supplier;
public $socid;
@ -131,6 +147,7 @@ class FactureFournisseur extends CommonInvoice
* @var SupplierInvoiceLine[]
*/
public $lines = array();
/**
* @deprecated
*/

54
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -41,52 +41,52 @@ class ProductFournisseur extends Product
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
var $product_fourn_price_id; // id of ligne product-supplier
public $product_fourn_price_id; // id of ligne product-supplier
/**
* @var int ID
*/
public $id;
/**
* @deprecated
* @see ref_supplier
*/
var $fourn_ref;
var $delivery_time_days;
var $ref_supplier; // ref supplier (can be set by get_buyprice)
var $desc_supplier;
var $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
public $fourn_ref;
public $delivery_time_days;
public $ref_supplier; // ref supplier (can be set by get_buyprice)
public $desc_supplier;
public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
var $fourn_id; //supplier id
var $fourn_qty; // quantity for price (can be set by get_buyprice)
var $fourn_pu; // unit price for quantity (can be set by get_buyprice)
public $fourn_id; //supplier id
public $fourn_qty; // quantity for price (can be set by get_buyprice)
public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
var $fourn_price; // price for quantity
var $fourn_remise_percent; // discount for quantity (percent)
var $fourn_remise; // discount for quantity (amount)
var $product_fourn_id; // supplier id
var $fk_availability; // availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay)
var $fourn_unitprice;
var $fourn_tva_tx;
var $fourn_tva_npr;
public $fourn_price; // price for quantity
public $fourn_remise_percent; // discount for quantity (percent)
public $fourn_remise; // discount for quantity (amount)
public $product_fourn_id; // supplier id
public $fk_availability; // availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay)
public $fourn_unitprice;
public $fourn_tva_tx;
public $fourn_tva_npr;
var $fk_supplier_price_expression;
var $supplier_reputation; // reputation of supplier
var $reputations=array(); // list of available supplier reputations
public $fk_supplier_price_expression;
public $supplier_reputation; // reputation of supplier
public $reputations=array(); // list of available supplier reputations
// Multicurreny
var $fourn_multicurrency_id;
var $fourn_multicurrency_code;
var $fourn_multicurrency_tx;
var $fourn_multicurrency_price;
var $fourn_multicurrency_unitprice;
public $fourn_multicurrency_id;
public $fourn_multicurrency_code;
public $fourn_multicurrency_tx;
public $fourn_multicurrency_price;
public $fourn_multicurrency_unitprice;
/**
* Constructor

17
htdocs/holiday/class/holiday.class.php
View File

@ -36,12 +36,12 @@ class Holiday extends CommonObject
* @var string ID to identify managed object
*/
public $element='holiday';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='holiday';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $fk_element = 'fk_holiday';
public $picto = 'holiday';
@ -52,9 +52,18 @@ class Holiday extends CommonObject
*/
var $rowid;
var $fk_user;
/**
* @var int User ID
*/
public $fk_user;
var $date_create='';
var $description;
/**
* @var string description
*/
public $description;
var $date_debut=''; // Date start in PHP server TZ
var $date_fin=''; // Date end in PHP server TZ
var $date_debut_gmt=''; // Date start in GMT

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

@ -32,19 +32,38 @@ class Establishment extends CommonObject
* @var string ID to identify managed object
*/
public $element='establishment';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='establishment';
/**
* @var int Name of subtable line
*/
public $table_element_line = '';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_establishment';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='building';
public $id;
public $ref;
/**
* @var int ID
*/
public $id;
/**
* @var string Ref
*/
public $ref;
/**
* @var int ID
*/
public $rowid;
public $name;
@ -52,6 +71,10 @@ class Establishment extends CommonObject
public $zip;
public $town;
public $status; // 0=open, 1=closed
/**
* @var int Entity
*/
public $entity;
public $country_id;

65
htdocs/livraison/class/livraison.class.php
View File

@ -3,8 +3,8 @@
* Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -24,7 +24,7 @@
/**
* \file htdocs/livraison/class/livraison.class.php
* \ingroup delivery
* \brief Fichier de la classe de gestion des bons de livraison
* \brief Delivery Order Management Class File
*/
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@ -43,24 +43,30 @@ class Livraison extends CommonObject
* @var string ID to identify managed object
*/
public $element="delivery";
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element="fk_livraison";
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element="livraison";
/**
* @var int Name of subtable line
*/
public $table_element_line="livraisondet";
var $brouillon;
var $socid;
var $ref_customer;
public $brouillon;
public $socid;
public $ref_customer;
var $date_delivery; // Date really received
var $date_creation;
var $date_valid;
var $model_pdf;
public $date_delivery; // Date really received
public $date_creation;
public $date_valid;
public $model_pdf;
/**
* Constructor
@ -158,7 +164,7 @@ class Livraison extends CommonObject
/*
* Insertion des produits dans la base
* Inserting products into the database
*/
$num=count($this->lines);
for ($i = 0; $i < $num; $i++)
@ -311,7 +317,7 @@ class Livraison extends CommonObject
if ($this->statut == 0) $this->brouillon = 1;
// Retreive all extrafield
// Retreive all extrafields
// fetch optionals attributes and labels
$this->fetch_optionals();
@ -362,7 +368,7 @@ class Livraison extends CommonObject
{
if (! empty($conf->global->LIVRAISON_ADDON_NUMBER))
{
// Definition du nom de module de numerotation de commande
// Setting the command numbering module name
$modName = $conf->global->LIVRAISON_ADDON_NUMBER;
if (is_readable(DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php'))
@ -371,7 +377,7 @@ class Livraison extends CommonObject
$now=dol_now();
// Recuperation de la nouvelle reference
// Retrieving the new reference
$objMod = new $modName($this->db);
$soc = new Societe($this->db);
$soc->fetch($this->socid);
@ -386,8 +392,7 @@ class Livraison extends CommonObject
}
$this->newref = $numref;
// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
// de decrementer 2 fois le stock.
// Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice.
$sql = "SELECT ref";
$sql.= " FROM ".MAIN_DB_PREFIX."livraison";
$sql.= " WHERE ref = '".$this->db->escape($numref)."'";
@ -494,10 +499,10 @@ class Livraison extends CommonObject
}
/**
* Cree le bon de livraison depuis une expedition existante
* Creating the delivery slip from an existing shipment
*
* @param User $user Utilisateur qui cree
* @param int $sending_id Id de l'expedition qui sert de modele
* @param User $user User who creates
* @param int $sending_id Id of the expedition that serves as a model
* @return integer
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@ -1067,7 +1072,7 @@ class Livraison extends CommonObject
/**
* Classe de gestion des lignes de bons de livraison
* Management class of delivery note lines
*/
class LivraisonLigne extends CommonObjectLine
{
@ -1083,13 +1088,17 @@ class LivraisonLigne extends CommonObjectLine
var $price;
var $fk_product;
var $origin_id;
/**
* @var string proper name for given parameter
* @var string delivery note lines label
*/
public $label;
var $description; // Description produit
/**
* @var string product description
*/
public $description;
/**
* @deprecated
* @see product_ref
@ -1108,7 +1117,7 @@ class LivraisonLigne extends CommonObjectLine
* @var string ID to identify managed object
*/
public $element='livraisondet';
/**
* @var string Name of table without prefix where object is stored
*/

4
htdocs/loan/class/loan.class.php
View File

@ -43,7 +43,11 @@ class Loan extends CommonObject
public $picto = 'bill';
/**
* @var int ID
*/
public $rowid;
public $datestart;
public $dateend;
public $label;

28
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -36,22 +36,22 @@ class MyObject extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'myobject';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'mymodule_myobject';
/**
* @var int Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 0;
/**
* @var int Does myobject support extrafields ? 0=No, 1=Yes
*/
public $isextrafieldmanaged = 1;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
@ -101,9 +101,21 @@ class MyObject extends CommonObject
'status' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
);
/**
* @var int ID
*/
public $rowid;
/**
* @var string Ref
*/
public $ref;
/**
* @var int Entity
*/
public $entity;
public $label;
public $amount;
public $status;
@ -122,22 +134,22 @@ class MyObject extends CommonObject
* @var int Name of subtable line
*/
//public $table_element_line = 'myobjectdet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
//public $fk_element = 'fk_myobject';
/**
* @var int Name of subtable class that manage subtable lines
*/
//public $class_element_line = 'MyObjectline';
/**
* @var array Array of child tables (child tables to delete before deleting a record)
*/
//protected $childtables=array('myobjectdet');
/**
* @var MyObjectLine[] Array of subtable lines
*/

30
htdocs/multicurrency/class/multicurrency.class.php
View File

@ -42,12 +42,12 @@ class MultiCurrency extends CommonObject
* @var string Id to identify managed objects
*/
public $element = 'multicurrency';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'multicurrency';
/**
* @var string Name of table without prefix where object is stored
*/
@ -62,32 +62,32 @@ class MultiCurrency extends CommonObject
* @var mixed Sample property 1
*/
public $id;
/**
* @var mixed Sample property 1
*/
public $code;
/**
* @var mixed Sample property 2
*/
public $name;
/**
* @var mixed Sample property 2
* @var int Entity
*/
public $entity;
/**
* @var mixed Sample property 2
*/
public $date_create;
/**
* @var mixed Sample property 2
*/
public $fk_user;
/**
* @var mixed Sample property 2
*/
@ -694,32 +694,32 @@ class CurrencyRate extends CommonObjectLine
* @var string Id to identify managed objects
*/
public $element = 'multicurrency_rate';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'multicurrency_rate';
/**
* @var int ID
*/
public $id;
/**
* @var double Rate
*/
public $rate;
/**
* @var date Date synchronisation
*/
public $date_sync;
/**
* @var int Id of currency
*/
public $fk_multicurrency;
/**
* @var int Id of entity
*/

4
htdocs/opensurvey/class/opensurveysondage.class.php
View File

@ -52,6 +52,10 @@ class Opensurveysondage extends CommonObject
* @see description
*/
public $commentaires;
/**
* @var string description
*/
public $description;
public $mail_admin;

4
htdocs/product/class/product.class.php
View File

@ -53,7 +53,11 @@ class Product extends CommonObject
*/
public $table_element='product';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_product';
protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

94
htdocs/product/class/productcustomerprice.class.php
View File

@ -38,24 +38,34 @@ class Productcustomerprice extends CommonObject
*/
public $table_element = 'product_customer_price';
var $entity;
var $datec = '';
var $tms = '';
var $fk_product;
var $fk_soc;
var $price;
var $price_ttc;
var $price_min;
var $price_min_ttc;
var $price_base_type;
var $tva_tx;
var $recuperableonly;
var $localtax1_type;
var $localtax1_tx;
var $localtax2_type;
var $localtax2_tx;
var $fk_user;
var $lines = array ();
public $entity;
public $datec = '';
public $tms = '';
public $fk_product;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $price;
public $price_ttc;
public $price_min;
public $price_min_ttc;
public $price_base_type;
public $tva_tx;
public $recuperableonly;
public $localtax1_type;
public $localtax1_tx;
public $localtax2_type;
public $localtax2_tx;
/**
* @var int User ID
*/
public $fk_user;
public $lines = array ();
/**
* Constructor
@ -965,23 +975,33 @@ class PriceByCustomerLine
*/
public $id;
var $entity;
var $datec = '';
var $tms = '';
var $fk_product;
var $fk_soc;
var $price;
var $price_ttc;
var $price_min;
var $price_min_ttc;
var $price_base_type;
var $default_vat_code;
var $tva_tx;
var $recuperableonly;
var $localtax1_tx;
var $localtax2_tx;
var $fk_user;
var $import_key;
var $socname;
var $prodref;
public $entity;
public $datec = '';
public $tms = '';
public $fk_product;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $price;
public $price_ttc;
public $price_min;
public $price_min_ttc;
public $price_base_type;
public $default_vat_code;
public $tva_tx;
public $recuperableonly;
public $localtax1_tx;
public $localtax2_tx;
/**
* @var int User ID
*/
public $fk_user;
public $import_key;
public $socname;
public $prodref;
}

16
htdocs/product/class/propalmergepdfproduct.class.php
View File

@ -645,14 +645,14 @@ class PropalmergepdfproductLine
*/
public $id;
var $fk_product;
var $file_name;
var $lang;
var $fk_user_author;
var $fk_user_mod;
var $datec='';
var $tms='';
var $import_key;
public $fk_product;
public $file_name;
public $lang;
public $fk_user_author;
public $fk_user_mod;
public $datec='';
public $tms='';
public $import_key;
/**
* Constructor

12
htdocs/product/dynamic_price/class/price_expression.class.php
View File

@ -33,7 +33,7 @@ class PriceExpression
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -43,15 +43,15 @@ class PriceExpression
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**
* @var int ID
*/
public $id;
var $title;
var $expression;
public $title;
public $expression;
/**
* @var string Name of table without prefix where object is stored
*/

21
htdocs/product/dynamic_price/class/price_global_variable.class.php
View File

@ -33,26 +33,31 @@ class PriceGlobalVariable
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**
* @var int ID
*/
public $id;
var $code;
var $description;
var $value;
public $code;
/**
* @var string description
*/
public $description;
public $value;
/**
* @var string Name of table without prefix where object is stored
*/

35
htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
View File

@ -33,33 +33,38 @@ class PriceGlobalVariableUpdater
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
var $types=array(0, 1); //!< Updater types
var $update_min = 5; //!< Minimal update rate
public $types=array(0, 1); //!< Updater types
public $update_min = 5; //!< Minimal update rate
/**
* @var int ID
*/
public $id;
var $type;
var $description;
var $parameters;
var $fk_variable;
var $update_interval; //!< Interval in mins
var $next_update; //!< Next update timestamp
var $last_status;
public $type;
/**
* @var string description
*/
public $description;
public $parameters;
public $fk_variable;
public $update_interval; //!< Interval in mins
public $next_update; //!< Next update timestamp
public $last_status;
/**
* @var string Name of table without prefix where object is stored
*/

26
htdocs/product/inventory/class/inventory.class.php
View File

@ -38,7 +38,7 @@ class Inventory extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'inventory';
/**
* @var string Name of table without prefix where object is stored
*/
@ -48,7 +48,7 @@ class Inventory extends CommonObject
* @var array Does inventory support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for inventory
*/
@ -99,9 +99,21 @@ class Inventory extends CommonObject
'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'default'=>0, 'arrayofkeyval'=>array(0=>'Todo', 1=>'Done', -1=>'Cancel')),
);
/**
* @var int ID
*/
public $rowid;
/**
* @var string Ref
*/
public $ref;
/**
* @var int Entity
*/
public $entity;
public $fk_warehouse;
public $date_inventory;
public $title;
@ -123,22 +135,22 @@ class Inventory extends CommonObject
* @var int Name of subtable line
*/
//public $table_element_line = 'inventorydet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
//public $fk_element = 'fk_inventory';
/**
* @var int Name of subtable class that manage subtable lines
*/
//public $class_element_line = 'Inventoryline';
/**
* @var array Array of child tables (child tables to delete before deleting a record)
*/
//protected $childtables=array('inventorydet');
/**
* @var InventoryLine[] Array of subtable lines
*/
@ -471,10 +483,12 @@ class InventoryObjectLine
* @var int ID
*/
public $id;
/**
* @var mixed Sample line property 1
*/
public $prop1;
/**
* @var mixed Sample line property 2
*/

11
htdocs/product/stock/class/entrepot.class.php
View File

@ -37,12 +37,12 @@ class Entrepot extends CommonObject
* @var string ID to identify managed object
*/
public $element='stock';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='entrepot';
public $picto='stock';
/**
@ -61,7 +61,12 @@ class Entrepot extends CommonObject
const STATUS_OPEN_INTERNAL = 2;
var $libelle;
var $description;
/**
* @var string description
*/
public $description;
var $statut;
var $lieu;
var $address;

8
htdocs/product/stock/class/productlot.class.php
View File

@ -39,7 +39,7 @@ class Productlot extends CommonObject
* @var string Id to identify managed objects
*/
public $element = 'productlot';
/**
* @var string Name of table without prefix where object is stored
*/
@ -55,9 +55,10 @@ class Productlot extends CommonObject
public $lines = array();
/**
* @var int Entity
*/
public $entity;
public $fk_product;
public $batch;
public $eatby = '';
@ -68,9 +69,6 @@ class Productlot extends CommonObject
public $fk_user_modif;
public $import_key;
/**
*/
/**
* Constructor

62
htdocs/projet/class/project.class.php
View File

@ -43,8 +43,16 @@ class Project extends CommonObject
*/
public $table_element = 'projet';
public $table_element_line = 'projet_task';
public $fk_element = 'fk_projet';
/**
* @var int Name of subtable line
*/
public $table_element_line = 'projet_task';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_projet';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'projectpub';
@ -53,38 +61,43 @@ class Project extends CommonObject
*/
protected $table_ref_field = 'ref';
var $description;
/**
* @var string description
*/
public $description;
/**
* @var string
* @deprecated
* @see title
*/
public $titre;
var $title;
var $date_start;
var $date_end;
var $date_close;
var $socid; // To store id of thirdparty
var $thirdparty_name; // To store name of thirdparty (defined only in some cases)
public $title;
public $date_start;
public $date_end;
public $date_close;
var $user_author_id; //!< Id of project creator. Not defined if shared project.
var $user_close_id;
var $public; //!< Tell if this is a public or private project
var $budget_amount;
var $bill_time; // Is the time spent on project must be invoiced or not
public $socid; // To store id of thirdparty
public $thirdparty_name; // To store name of thirdparty (defined only in some cases)
var $statuts_short;
var $statuts_long;
public $user_author_id; //!< Id of project creator. Not defined if shared project.
public $user_close_id;
public $public; //!< Tell if this is a public or private project
public $budget_amount;
public $bill_time; // Is the time spent on project must be invoiced or not
var $statut; // 0=draft, 1=opened, 2=closed
var $opp_status; // opportunity status, into table llx_c_lead_status
var $opp_percent; // opportunity probability
public $statuts_short;
public $statuts_long;
var $oldcopy;
public $statut; // 0=draft, 1=opened, 2=closed
public $opp_status; // opportunity status, into table llx_c_lead_status
public $opp_percent; // opportunity probability
var $weekWorkLoad; // Used to store workload details of a projet
var $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
public $oldcopy;
public $weekWorkLoad; // Used to store workload details of a projet
public $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
/**
* @var int Creation date
@ -92,16 +105,19 @@ class Project extends CommonObject
* @see date_c
*/
public $datec;
/**
* @var int Creation date
*/
public $date_c;
/**
* @var int Modification date
* @deprecated
* @see date_m
*/
public $datem;
/**
* @var int Modification date
*/
@ -116,10 +132,12 @@ class Project extends CommonObject
* Draft status
*/
const STATUS_DRAFT = 0;
/**
* Open/Validated status
*/
const STATUS_VALIDATED = 1;
/**
* Closed status
*/

10
htdocs/projet/class/task.class.php
View File

@ -41,7 +41,11 @@ class Task extends CommonObject
*/
public $table_element='projet_task';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_task';
public $picto = 'task';
protected $childtables=array('projet_task_time'); // To test if we can delete object
@ -52,7 +56,11 @@ class Task extends CommonObject
*/
public $label;
var $description;
/**
* @var string description
*/
public $description;
var $duration_effective; // total of time spent on this task
var $planned_workload;
var $date_c;

9
htdocs/societe/class/address.class.php
View File

@ -33,7 +33,11 @@ class Address
{
protected $db;
/**
* @var int ID
*/
public $id;
public $type;
public $label;
public $socid;
@ -496,7 +500,12 @@ class Address
class AddressLine
{
protected $db;
/**
* @var int ID
*/
public $id;
public $date_creation;
public $date_modification;
public $label;

19
htdocs/societe/class/companypaymentmode.class.php
View File

@ -36,22 +36,22 @@ class CompanyPaymentMode extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'companypaymentmode';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'societe_rib';
/**
* @var int Does companypaymentmode support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 2;
/**
* @var int Does companypaymentmode support extrafields ? 0=No, 1=Yes
*/
public $isextrafieldmanaged = 0;
/**
* @var string String with name of icon for companypaymentmode. Must be the part after the 'object_' into object_companypaymentmode.png
*/
@ -118,8 +118,17 @@ class CompanyPaymentMode extends CommonObject
'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>-2, 'position'=>105),
//'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
);
/**
* @var int ID
*/
public $rowid;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $label;
public $bank;
public $code_banque;

11
htdocs/societe/class/societe.class.php
View File

@ -51,7 +51,11 @@ class Societe extends CommonObject
*/
public $table_element = 'societe';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_soc';
public $fieldsforcombobox='nom,name_alias';
protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord'); // To test if we can delete object
protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
@ -90,6 +94,9 @@ class Societe extends CommonObject
);
/**
* @var int Entity
*/
public $entity;
/**
@ -374,7 +381,11 @@ class Societe extends CommonObject
*/
public $default_lang;
/**
* @var string Ref
*/
public $ref;
public $ref_int;
/**
* External user reference.

18
htdocs/societe/class/societeaccount.class.php
View File

@ -39,17 +39,17 @@ class SocieteAccount extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'societeaccount';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'societe_account';
/**
* @var array Does societeaccount support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 0;
/**
* @var string String with name of icon for societeaccount. Must be the part after the 'object_' into object_myobject.png
*/
@ -100,13 +100,23 @@ class SocieteAccount extends CommonObject
'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
);
public $rowid;
/**
* @var int Entity
*/
public $entity;
public $key_account;
public $login;
public $pass_encoding;
public $pass_crypted;
public $pass_temp;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $site;
public $date_last_login;
public $date_previous_login;

23
htdocs/stripe/class/stripe.class.php
View File

@ -28,15 +28,36 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/config.php'; // This set stripe glo
*/
class Stripe extends CommonObject
{
/**
* @var int ID
*/
public $rowid;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $fk_key;
/**
* @var int ID
*/
public $id;
public $mode;
/**
* @var int Entity
*/
public $entity;
public $statut;
public $type;
public $code;
public $message;
/**

188
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -7,7 +7,7 @@
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2008 Raphael Bertrand <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2010-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2014 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
@ -49,20 +49,27 @@ class SupplierProposal extends CommonObject
* @var string ID to identify managed object
*/
public $element='supplier_proposal';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='supplier_proposal';
public $table_element_line='supplier_proposaldet';
/**
* @var int Name of subtable line
*/
public $table_element_line='supplier_proposaldet';
public $fk_element='fk_supplier_proposal';
public $picto='propal';
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer
@ -74,24 +81,25 @@ class SupplierProposal extends CommonObject
*/
protected $table_ref_field = 'ref';
var $socid; // Id client
public $socid; // Id client
/**
* @deprecated
* @see user_author_id
*/
var $author;
var $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
var $ref_supplier; //Reference saisie lors de l'ajout d'une ligne à la demande
var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
var $date; // Date of proposal
var $date_livraison;
public $author;
public $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
public $ref_supplier; //Reference saisie lors de l'ajout d'une ligne à la demande
public $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
public $date; // Date of proposal
public $date_livraison;
/**
* @deprecated
* @see date_creation
*/
var $datec;
public $datec;
/**
* Creation date
@ -103,7 +111,7 @@ class SupplierProposal extends CommonObject
* @deprecated
* @see date_validation
*/
var $datev;
public $datev;
/**
* Validation date
@ -112,70 +120,76 @@ class SupplierProposal extends CommonObject
public $date_validation;
var $user_author_id;
var $user_valid_id;
var $user_close_id;
public $user_author_id;
public $user_valid_id;
public $user_close_id;
/**
* @deprecated
* @see price_ht
*/
var $price;
public $price;
/**
* @deprecated
* @see total_tva
*/
var $tva;
public $tva;
/**
* @deprecated
* @see total_ttc
*/
var $total;
public $total;
var $cond_reglement_code;
var $mode_reglement_code;
var $remise = 0;
var $remise_percent = 0;
var $remise_absolue = 0;
public $cond_reglement_code;
public $mode_reglement_code;
public $remise = 0;
public $remise_percent = 0;
public $remise_absolue = 0;
var $products=array();
var $extraparams=array();
public $products=array();
public $extraparams=array();
var $lines = array();
var $line;
public $lines = array();
public $line;
var $labelstatut=array();
var $labelstatut_short=array();
public $labelstatut=array();
public $labelstatut_short=array();
var $nbtodo;
var $nbtodolate;
public $nbtodo;
public $nbtodolate;
var $specimen;
public $specimen;
// Multicurrency
var $fk_multicurrency;
var $multicurrency_code;
var $multicurrency_tx;
var $multicurrency_total_ht;
var $multicurrency_total_tva;
var $multicurrency_total_ttc;
public $fk_multicurrency;
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/**
* Draft status
*/
const STATUS_DRAFT = 0;
/**
* Validated status
*/
const STATUS_VALIDATED = 1;
/**
* Signed quote
*/
const STATUS_SIGNED = 2;
/**
* Not signed quote, canceled
*/
const STATUS_NOTSIGNED = 3;
/**
* Billed or closed/processed quote
*/
@ -2658,7 +2672,7 @@ class SupplierProposalLine extends CommonObjectLine
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -2668,31 +2682,32 @@ class SupplierProposalLine extends CommonObjectLine
* @var string ID to identify managed object
*/
public $element='supplier_proposaldet';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='supplier_proposaldet';
var $oldline;
public $oldline;
// From llx_supplier_proposaldet
var $rowid; // deprecated
public $rowid; // deprecated
/**
* @var int ID
*/
public $id;
var $fk_supplier_proposal;
var $fk_parent_line;
var $desc; // Description ligne
var $fk_product; // Id produit predefini
public $fk_supplier_proposal;
public $fk_parent_line;
public $desc; // Description ligne
public $fk_product; // Id produit predefini
/**
* @deprecated
* @see product_type
*/
var $fk_product_type;
public $fk_product_type;
/**
* Product type
* @var int
@ -2700,89 +2715,94 @@ class SupplierProposalLine extends CommonObjectLine
*/
public $product_type = Product::TYPE_PRODUCT;
var $qty;
var $tva_tx;
var $subprice;
var $remise_percent;
var $fk_remise_except;
public $qty;
public $tva_tx;
public $subprice;
public $remise_percent;
public $fk_remise_except;
var $rang = 0;
public $rang = 0;
var $fk_fournprice;
var $pa_ht;
var $marge_tx;
var $marque_tx;
public $fk_fournprice;
public $pa_ht;
public $marge_tx;
public $marque_tx;
var $special_code; // Tag for special lines (exlusive tags)
public $special_code; // Tag for special lines (exlusive tags)
// 1: frais de port
// 2: ecotaxe
// 3: option line (when qty = 0)
var $info_bits = 0; // Liste d'options cumulables:
public $info_bits = 0; // Liste d'options cumulables:
// Bit 0: 0 si TVA normal - 1 si TVA NPR
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe
var $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
public $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
public $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
public $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
/**
* @deprecated
* @see remise_percent, fk_remise_except
*/
var $remise;
public $remise;
/**
* @deprecated
* @see subprice
*/
var $price;
public $price;
// From llx_product
/**
* @deprecated
* @see product_ref
*/
var $ref;
public $ref;
/**
* Product reference
* @var string
*/
public $product_ref;
/**
* @deprecated
* @see product_label
*/
var $libelle;
public $libelle;
/**
* Product label
* @var string
*/
public $product_label;
/**
* Product description
* @var string
*/
public $product_desc;
var $localtax1_tx; // Local tax 1
var $localtax2_tx; // Local tax 2
var $localtax1_type; // Local tax 1 type
var $localtax2_type; // Local tax 2 type
var $total_localtax1; // Line total local tax 1
var $total_localtax2; // Line total local tax 2
public $localtax1_tx; // Local tax 1
public $localtax2_tx; // Local tax 2
public $localtax1_type; // Local tax 1 type
public $localtax2_type; // Local tax 2 type
public $total_localtax1; // Line total local tax 1
public $total_localtax2; // Line total local tax 2
var $skip_update_total; // Skip update price total for special lines
public $skip_update_total; // Skip update price total for special lines
var $ref_fourn;
var $ref_supplier;
public $ref_fourn;
public $ref_supplier;
// Multicurrency
var $fk_multicurrency;
var $multicurrency_code;
var $multicurrency_subprice;
var $multicurrency_total_ht;
var $multicurrency_total_tva;
var $multicurrency_total_ttc;
public $fk_multicurrency;
public $multicurrency_code;
public $multicurrency_subprice;
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/**
* Class line Contructor

18
htdocs/ticket/class/actions_ticket.class.php
View File

@ -39,21 +39,21 @@ class ActionsTicket
* @var DoliDB Database handler.
*/
public $db;
public $dao;
public $mesg;
/**
* @var string Error code (or message)
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
//! Numero de l'erreur
public $errno = 0;
@ -61,9 +61,17 @@ class ActionsTicket
public $template;
public $label;
public $description;
/**
* @var string description
*/
public $description;
public $fk_statut;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
/**

9
htdocs/ticket/class/ticket.class.php
View File

@ -2486,7 +2486,10 @@ class Ticket extends CommonObject
*/
class TicketsLine
{
public $id;
/**
* @var int ID
*/
public $id;
/**
* @var string $ref Ticket reference
@ -2499,8 +2502,8 @@ class TicketsLine
public $track_id;
/**
* Thirdparty ID
*/
* @var int Thirdparty ID
*/
public $fk_soc;
/**

5
htdocs/ticket/class/ticketlogs.class.php
View File

@ -57,7 +57,10 @@ class Ticketlogs// extends CommonObject
*/
public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored
public $id;
/**
* @var int ID
*/
public $id;
public $fk_track_id;
public $fk_user_create;

8
htdocs/user/class/user.class.php
View File

@ -76,6 +76,10 @@ class User extends CommonObject
public $admin;
public $login;
public $api_key;
/**
* @var int Entity
*/
public $entity;
//! Clear password in memory
@ -103,6 +107,10 @@ class User extends CommonObject
public $contactid;
public $fk_member;
/**
* @var int User ID
*/
public $fk_user;
public $clicktodial_url;

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

@ -39,16 +39,19 @@ class UserGroup extends CommonObject
* @var string ID to identify managed object
*/
public $element='usergroup';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='usergroup';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='group';
public $entity; // Entity of group
/**
* @var int Entity of group
*/
public $entity;
public $name; // Name of group
/**

28
htdocs/website/class/website.class.php
View File

@ -39,57 +39,57 @@ class Website extends CommonObject
* @var string Id to identify managed objects
*/
public $element = 'website';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'website';
/**
* @var array Does website support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for website. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'globe';
/**
* @var int
* @var int Entity
*/
public $entity;
/**
* @var string
* @var string Ref
*/
public $ref;
/**
* @var string
* @var string description
*/
public $description;
/**
* @var int
* @var int Status
*/
public $status;
/**
* @var mixed
*/
public $date_creation;
/**
* @var mixed
*/
public $tms = '';
/**
* @var integer
*/
public $fk_default_home;
/**
* @var string
*/

9
htdocs/website/class/websitepage.class.php
View File

@ -39,12 +39,12 @@ class WebsitePage extends CommonObject
* @var string Id to identify managed objects
*/
public $element = 'websitepage';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'website_page';
/**
* @var string String with name of icon for websitepage. Must be the part after the 'object_' into object_myobject.png
*/
@ -55,7 +55,12 @@ class WebsitePage extends CommonObject
public $aliasalt;
public $type_container;
public $title;
/**
* @var string description
*/
public $description;
public $keywords;
public $htmlheader;
public $content;