Merge pull request #9278 from grandoc/new_branch_21_08_2018

Update and standardize code
This commit is contained in:
Laurent Destailleur 2018-08-28 02:13:28 +02:00 committed by GitHub
commit 1842a4bb41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
223 changed files with 2056 additions and 398 deletions

View File

@ -30,11 +30,31 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
*/
class AccountancyCategory // extends CommonObject
{
public $db; //!< To store db handler
public $error; //!< To return error code (or message)
public $errors=array(); //!< To return several error codes (or messages)
public $element='c_accounting_category'; //!< Id that identify managed objects
public $table_element='c_accounting_category'; //!< Name of table without prefix where object is stored
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error string
* @see errors
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**
* @var string ID to identify managed object
*/
public $element='c_accounting_category';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='c_accounting_category';
public $id;
public $code;

View File

@ -28,7 +28,11 @@
*/
class AccountancySystem
{
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
@ -38,7 +42,12 @@ class AccountancySystem
var $fk_pcg_version;
var $pcg_type;
var $pcg_subtype;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $account_number;
var $account_parent;

View File

@ -31,7 +31,12 @@
class AccountingAccount extends CommonObject
{
public $element='accounting_account';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='accounting_account';
public $picto = 'billr';
/**
@ -39,26 +44,33 @@ class AccountingAccount extends CommonObject
* @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
*/
public $restrictiononfksoc = 1;
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
public $error='';
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
var $id;
/**
* @var int ID
*/
public $id;
var $rowid;
var $datec; // Creation date
var $fk_pcg_version;
@ -67,7 +79,12 @@ class AccountingAccount extends CommonObject
var $account_number;
var $account_parent;
var $account_category;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $fk_user_author;
var $fk_user_modif;
var $active; // duplicate with status

View File

@ -26,8 +26,16 @@
*/
class AccountingJournal extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='accounting_journal';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='accounting_journal';
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'generic';

View File

@ -35,14 +35,17 @@ class BookKeeping extends CommonObject
* @var string Error code (or message)
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/
public $errors = array ();
public $errors = array();
/**
* @var string Id to identify managed objects
*/
public $element = 'accountingbookkeeping';
/**
* @var string Name of table without prefix where object is stored
*/

View File

@ -28,10 +28,10 @@
abstract class ActionsAdherentCardCommon
{
/**
* Database handler
* @var DoliDB
* @var DoliDB Database handler.
*/
var $db;
public $db;
var $dirmodule;
var $targetmodule;
var $canvas;
@ -41,11 +41,11 @@ abstract class ActionsAdherentCardCommon
var $tpl = array();
//! Object container
var $object;
/**
* @var string Error code (or message)
*/
public $error='';
public $error='';
/**
* @var string[] Error codes (or messages)

View File

@ -41,8 +41,16 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
*/
class Adherent extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='member';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='adherent';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $mesgs;

View File

@ -32,8 +32,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/
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';
public $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

View File

@ -32,6 +32,9 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/subscription.class.php';
*/
class AdherentStats extends Stats
{
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element;
var $socid;

View File

@ -32,8 +32,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/
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

View File

@ -35,18 +35,22 @@ class Asset extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'asset';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'asset';
/**
* @var int Does module 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 asset support extrafields ? 0=No, 1=Yes
*/
public $isextrafieldmanaged = 1;
/**
* @var string String with name of icon for asset. Must be the part after the 'object_' into object_asset.png
*/

View File

@ -29,8 +29,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/
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';
public $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

View File

@ -46,6 +46,10 @@ class BlockedLog
public $entity;
public $error = '';
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**

View File

@ -28,14 +28,29 @@
*/
class Bookmark extends CommonObject
{
public $element='bookmark';
/**
* @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 $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $id;
/**
* @var int ID
*/
public $id;
var $fk_user;
var $datec;
var $url;

View File

@ -148,7 +148,14 @@ class Categorie extends CommonObject
'project' => 'projet',
);
/**
* @var string ID to identify managed object
*/
public $element='category';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='categorie';
public $fk_parent;

View File

@ -34,15 +34,25 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/
class ActionComm extends CommonObject
{
public $element='action';
/**
* @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';
/**
* 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
@ -53,7 +63,7 @@ class ActionComm extends CommonObject
* Id of the event
* @var int
*/
var $id;
public $id;
/**
* Id of the event. Use $id as possible
@ -67,7 +77,10 @@ class ActionComm extends CommonObject
var $type_color; // Color into parent table llx_c_actioncomm (used only if option to use type is set)
var $code; // Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
/**
* @var string

View File

@ -34,14 +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
*/

View File

@ -29,18 +29,29 @@
class CActionComm
{
/**
* @var string Error code (or message)
*/
public $error='';
* @var string Error code (or message)
*/
public $error='';
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $id;
/**
* @var int ID
*/
public $id;
var $code;
var $type;
var $libelle; // deprecated
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $active;
var $color;
var $picto;

View File

@ -28,23 +28,35 @@
*/
class AdvanceTargetingMailing extends CommonObject
{
var $db; //!< To store db handler
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
public $error='';
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
var $element='advtargetemailing'; //!< Id that identify managed objects
var $table_element='advtargetemailing'; //!< Name of table without prefix where object is stored
/**
* @var string ID to identify managed object
*/
public $element='advtargetemailing';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='advtargetemailing';
var $id;
/**
* @var int ID
*/
public $id;
var $name;
var $entity;
@ -960,4 +972,4 @@ class AdvanceTargetingMailing extends CommonObject
}
}
}

View File

@ -26,7 +26,11 @@
*/
class FormAdvTargetEmailing extends Form
{
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/

View File

@ -31,8 +31,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
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';
public $picto='email';
var $titre;

View File

@ -45,16 +45,26 @@ require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
*/
class Propal extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='propal';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='propal';
public $table_element_line='propaldet';
public $fk_element='fk_propal';
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
@ -3649,7 +3659,14 @@ class Propal extends CommonObject
*/
class PropaleLigne extends CommonObjectLine
{
/**
* @var string ID to identify managed object
*/
public $element='propaldet';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='propaldet';
var $oldline;

View File

@ -35,7 +35,10 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
*/
class PropaleStats extends Stats
{
public $table_element;
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element;
var $socid;
var $userid;

View File

@ -42,8 +42,16 @@ require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
*/
class Commande extends CommonOrder
{
public $element='commande';
public $table_element='commande';
/**
* @var string ID to identify managed object
*/
public $element='commande';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='commande';
public $table_element_line = 'commandedet';
public $class_element_line = 'OrderLine';
public $fk_element = 'fk_commande';
@ -3779,7 +3787,11 @@ class Commande extends CommonOrder
*/
class OrderLine extends CommonOrderLine
{
/**
* @var string ID to identify managed object
*/
public $element='commandedet';
public $table_element='commandedet';
var $oldline;
@ -3801,7 +3813,12 @@ class OrderLine extends CommonOrderLine
// From llx_commandedet
var $fk_parent_line;
var $fk_facture;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $fk_remise_except;
var $rang = 0;
var $fk_fournprice;

View File

@ -34,6 +34,9 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
*/
class CommandeStats extends Stats
{
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element;
var $socid;

View File

@ -36,8 +36,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
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';
/**
@ -1633,13 +1641,33 @@ class Account extends CommonObject
*/
class AccountLine extends CommonObject
{
var $error;
var $db;
var $element='bank';
var $table_element='bank';
/**
* @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';
var $id;
/**
* @var int ID
*/
public $id;
var $ref;
var $datec;
var $dateo;
@ -1649,7 +1677,12 @@ class AccountLine extends CommonObject
*/
var $datev;
var $amount;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $note;
var $fk_user_author;
var $fk_user_rappro;

View File

@ -30,11 +30,23 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class PaymentVarious extends CommonObject
{
public $element='variouspayment'; //!< Id that identify managed objects
public $table_element='payment_various'; //!< Name of table without prefix where object is stored
/**
* @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 $id;
/**
* @var int ID
*/
public $id;
var $ref;
var $tms;
var $datep;
@ -43,7 +55,12 @@ class PaymentVarious extends CommonObject
var $amount;
var $type_payment;
var $num_payment;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $accountancy_code;
var $fk_project;
var $fk_bank;

View File

@ -31,8 +31,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
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';
public $table_element_line = '';
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

View File

@ -30,6 +30,9 @@ include_once DOL_DOCUMENT_ROOT . '/compta/deplacement/class/deplacement.class.ph
*/
class DeplacementStats extends Stats
{
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element;
var $socid;

View File

@ -39,8 +39,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
*/
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';
public $table_element_line='facturedet_rec';
public $fk_element='fk_facture';
public $picto='bill';
@ -1639,7 +1647,14 @@ class FactureRec extends CommonInvoice
*/
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
*/
public $table_element='facturedet_rec';
var $date_start_fill;

View File

@ -53,8 +53,16 @@ if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accoun
*/
class Facture extends CommonInvoice
{
/**
* @var string ID to identify managed object
*/
public $element='facture';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='facture';
public $table_element_line = 'facturedet';
public $fk_element = 'fk_facture';
public $picto='bill';
@ -4231,8 +4239,15 @@ class Facture extends CommonInvoice
*/
class FactureLigne extends CommonInvoiceLine
{
public $element='facturedet';
public $table_element='facturedet';
/**
* @var string ID to identify managed object
*/
public $element='facturedet';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='facturedet';
var $oldline;

View File

@ -35,7 +35,11 @@ class FactureStats extends Stats
var $socid;
var $userid;
public $table_element;
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element;
var $from;
var $field;
var $where;

View File

@ -28,8 +28,15 @@
*/
class PaymentTerm // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
@ -40,7 +47,10 @@ class PaymentTerm // extends CommonObject
//public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored
var $context =array();
var $id;
/**
* @var int ID
*/
public $id;
var $code;
var $sortorder;

View File

@ -29,8 +29,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class Localtax extends CommonObject
{
public $element='localtax'; //!< Id that identify managed objects
public $table_element='localtax'; //!< Name of table without prefix where object is stored
/**
* @var string ID to identify managed object
*/
public $element='localtax';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='localtax';
public $picto='payment';
var $ltt;
@ -38,7 +46,12 @@ class Localtax extends CommonObject
var $datep;
var $datev;
var $amount;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;

View File

@ -33,8 +33,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
*/
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;

View File

@ -34,15 +34,12 @@ class Cpaiement
* @var string Id to identify managed objects
*/
public $element = 'cpaiement';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'c_paiement';
/**
*/
public $code;
public $libelle;
public $type;
@ -50,9 +47,6 @@ class Cpaiement
public $accountancy_code;
public $module;
/**
*/
/**
* Constructor

View File

@ -36,8 +36,16 @@ require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
*/
class Paiement extends CommonObject
{
public $element='payment';
public $table_element='paiement';
/**
* @var string ID to identify managed object
*/
public $element='payment';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='paiement';
public $picto = 'payment';
var $facid;

View File

@ -39,8 +39,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
*/
class BonPrelevement extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='widthdraw';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='prelevement_bons';
public $picto = 'payment';
var $date_echeance;

View File

@ -31,8 +31,15 @@
*/
class LignePrelevement
{
var $id;
var $db;
/**
* @var int ID
*/
public $id;
/**
* @var DoliDB Database handler.
*/
public $db;
var $statuts = array();

View File

@ -30,8 +30,15 @@
*/
class RejetPrelevement
{
var $id;
var $db;
/**
* @var int ID
*/
public $id;
/**
* @var DoliDB Database handler.
*/
public $db;
/**

View File

@ -31,8 +31,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class PaymentSalary extends CommonObject
{
public $element='payment_salary'; //!< Id that identify managed objects
public $table_element='payment_salary'; //!< Name of table without prefix where object is stored
/**
* @var string ID to identify managed object
*/
public $element='payment_salary';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='payment_salary';
public $picto='payment';
public $tms;

View File

@ -29,6 +29,9 @@ include_once DOL_DOCUMENT_ROOT . '/compta/salaries/class/paymentsalary.class.php
*/
class SalariesStats extends Stats
{
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element;
var $socid;

View File

@ -38,14 +38,12 @@ class Cchargesociales
* @var string Id to identify managed objects
*/
public $element = 'cchargesociales';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'c_chargesociales';
/**
*/
public $libelle;
public $deductible;
public $active;
@ -53,9 +51,6 @@ class Cchargesociales
public $fk_pays;
public $module;
public $accountancy_code;
/**
*/
/**

View File

@ -32,9 +32,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/
class ChargeSociales extends CommonObject
{
public $element='chargesociales';
/**
* @var string ID to identify managed object
*/
public $element='chargesociales';
public $table='chargesociales';
public $table_element='chargesociales';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='chargesociales';
public $picto = 'bill';
/**

View File

@ -31,8 +31,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
*/
class PaymentSocialContribution extends CommonObject
{
public $element='paiementcharge'; //!< Id that identify managed objects
public $table_element='paiementcharge'; //!< Name of table without prefix where object is stored
/**
* @var string ID to identify managed object
*/
public $element='paiementcharge';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='paiementcharge';
public $picto = 'payment';
var $fk_charge;

View File

@ -33,8 +33,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class Tva extends CommonObject
{
public $element='tva'; //!< Id that identify managed objects
public $table_element='tva'; //!< Name of table without prefix where object is stored
/**
* @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;
@ -43,7 +51,12 @@ class Tva extends CommonObject
var $amount;
var $type_payment;
var $num_payment;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;

View File

@ -27,7 +27,11 @@
*/
abstract class ActionsContactCardCommon
{
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $dirmodule;
var $targetmodule;
var $canvas;
@ -37,8 +41,11 @@ abstract class ActionsContactCardCommon
var $tpl = array();
//! Object container
var $object;
//! Error string
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
/**

View File

@ -37,8 +37,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class Contact extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='contact';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='socpeople';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'contact';

View File

@ -41,16 +41,26 @@ require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php';
*/
class Contrat extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='contrat';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='contrat';
public $table_element_line='contratdet';
public $fk_element='fk_contrat';
public $picto='contract';
/**
* 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
@ -2451,10 +2461,21 @@ class Contrat extends CommonObject
*/
class ContratLigne extends CommonObjectLine
{
public $element='contratdet';
public $table_element='contratdet';
/**
* @var string ID to identify managed object
*/
public $element='contratdet';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='contratdet';
var $id;
/**
* @var int ID
*/
public $id;
var $ref;
var $tms;

View File

@ -37,7 +37,11 @@ class box_actions extends ModeleBoxes
var $boxlabel="BoxLastActions";
var $depends = array("agenda");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -35,7 +35,11 @@ class box_activity extends ModeleBoxes
var $boxlabel='BoxGlobalActivity';
var $depends = array("facture");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;

View File

@ -33,7 +33,11 @@ class box_bookmarks extends ModeleBoxes
var $boxlabel="BoxMyLastBookmarks";
var $depends = array("bookmark");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -37,7 +37,11 @@ class box_clients extends ModeleBoxes
var $boxlabel="BoxLastCustomers";
var $depends = array("societe");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $enabled = 1;
var $info_box_head = array();

View File

@ -37,7 +37,11 @@ class box_commandes extends ModeleBoxes
var $boxlabel="BoxLastCustomerOrders";
var $depends = array("commande");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -38,7 +38,11 @@ class box_comptes extends ModeleBoxes
var $boxlabel="BoxCurrentAccounts";
var $depends = array("banque"); // Box active if module banque active
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;

View File

@ -39,7 +39,11 @@ class box_contacts extends ModeleBoxes
var $boxlabel="BoxLastContacts";
var $depends = array("societe");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -36,7 +36,11 @@ class box_contracts extends ModeleBoxes
var $boxlabel="BoxLastContracts";
var $depends = array("contrat"); // conf->contrat->enabled
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -39,7 +39,11 @@ class box_external_rss extends ModeleBoxes
var $boxlabel="BoxLastRssInfos";
var $depends = array("externalrss");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $paramdef; // Params of box definition (not user params)
var $info_box_head = array();

View File

@ -35,7 +35,11 @@ class box_factures extends ModeleBoxes
var $boxlabel="BoxLastCustomerBills";
var $depends = array("facture");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -36,7 +36,11 @@ class box_factures_fourn extends ModeleBoxes
var $boxlabel="BoxLastSupplierBills";
var $depends = array("facture","fournisseur");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -35,7 +35,11 @@ class box_factures_fourn_imp extends ModeleBoxes
var $boxlabel = "BoxOldestUnpaidSupplierBills";
var $depends = array("facture","fournisseur");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -38,7 +38,11 @@ class box_factures_imp extends ModeleBoxes
var $boxlabel="BoxOldestUnpaidCustomerBills";
var $depends = array("facture");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -36,7 +36,11 @@ class box_ficheinter extends ModeleBoxes
var $boxlabel="BoxFicheInter";
var $depends = array("ficheinter"); // conf->contrat->enabled
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -36,7 +36,11 @@ class box_fournisseurs extends ModeleBoxes
var $boxlabel="BoxLastSuppliers";
var $depends = array("fournisseur");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -38,7 +38,11 @@ class box_goodcustomers extends ModeleBoxes
var $boxlabel="BoxGoodCustomers";
var $depends = array("societe");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $enabled = 1;
var $info_box_head = array();

View File

@ -33,7 +33,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
var $boxlabel="BoxCustomersInvoicesPerMonth";
var $depends = array("facture");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $info_box_head = array();
var $info_box_contents = array();

View File

@ -33,7 +33,10 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
var $boxlabel="BoxSuppliersInvoicesPerMonth";
var $depends = array("fournisseur");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $info_box_head = array();
var $info_box_contents = array();

View File

@ -33,7 +33,10 @@ class box_graph_orders_permonth extends ModeleBoxes
var $boxlabel="BoxCustomersOrdersPerMonth";
var $depends = array("commande");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $info_box_head = array();
var $info_box_contents = array();

View File

@ -33,7 +33,10 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
var $boxlabel="BoxSuppliersOrdersPerMonth";
var $depends = array("fournisseur");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $info_box_head = array();
var $info_box_contents = array();

View File

@ -33,7 +33,11 @@ class box_graph_product_distribution extends ModeleBoxes
var $boxlabel="BoxProductDistribution";
var $depends = array("product|service","facture|propal|commande");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -33,7 +33,10 @@ class box_graph_propales_permonth extends ModeleBoxes
var $boxlabel="BoxProposalsPerMonth";
var $depends = array("propal");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $info_box_head = array();
var $info_box_contents = array();

View File

@ -34,7 +34,12 @@ class box_last_modified_ticket extends ModeleBoxes
public $boximg = "ticket";
public $boxlabel;
public $depends = array("ticket");
/**
* @var DoliDB Database handler.
*/
public $db;
public $param;
public $info_box_head = array();
public $info_box_contents = array();

View File

@ -34,7 +34,12 @@ class box_last_ticket extends ModeleBoxes
public $boximg = "ticket";
public $boxlabel;
public $depends = array("ticket");
/**
* @var DoliDB Database handler.
*/
public $db;
public $param;
public $info_box_head = array();
public $info_box_contents = array();

View File

@ -35,7 +35,11 @@ class box_lastlogin extends ModeleBoxes
var $boxlabel='BoxLoginInformation';
var $depends = array("user");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;

View File

@ -37,7 +37,11 @@ class box_members extends ModeleBoxes
var $boxlabel="BoxLastMembers";
var $depends = array("adherent");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 1;

View File

@ -38,7 +38,11 @@ class box_produits extends ModeleBoxes
var $boxlabel="BoxLastProducts";
var $depends = array("produit");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -40,7 +40,11 @@ class box_produits_alerte_stock extends ModeleBoxes
var $boxlabel="BoxProductsAlertStock";
var $depends = array("produit");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -34,7 +34,12 @@ class box_project extends ModeleBoxes
var $boximg="object_projectpub";
var $boxlabel;
//var $depends = array("projet");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -37,7 +37,11 @@ class box_propales extends ModeleBoxes
var $boxlabel="BoxLastProposals";
var $depends = array("propal"); // conf->propal->enabled
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -39,7 +39,11 @@ class box_prospect extends ModeleBoxes
var $boxlabel="BoxLastProspects";
var $depends = array("societe");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $enabled = 1;
var $info_box_head = array();

View File

@ -37,7 +37,11 @@ class box_services_contracts extends ModeleBoxes
var $boxlabel="BoxLastProductsInContract";
var $depends = array("service","contrat");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -35,7 +35,11 @@ class box_services_expired extends ModeleBoxes
var $boxlabel="BoxOldestExpiredServices";
var $depends = array("contrat"); // conf->propal->enabled
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();

View File

@ -36,7 +36,11 @@ class box_supplier_orders extends ModeleBoxes
var $boxlabel="BoxLatestSupplierOrders";
var $depends = array("fournisseur");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
var $info_box_contents = array();

View File

@ -35,7 +35,12 @@ class box_task extends ModeleBoxes
var $boximg="object_projecttask";
var $boxlabel;
//var $depends = array("projet");
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $enabled = 0; // Disabled because bugged.

View File

@ -30,7 +30,10 @@
*/
class AntiVir
{
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
@ -38,7 +41,11 @@ class AntiVir
public $errors = array();
var $output;
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* Constructor

View File

@ -28,8 +28,15 @@
*/
class Canvas
{
var $db;
var $error;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)

View File

@ -32,8 +32,15 @@
*/
class Ccountry // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
@ -43,10 +50,19 @@ class Ccountry // extends CommonObject
//var $element='ccountry'; //!< Id that identify managed objects
//var $table_element='ccountry'; //!< Name of table without prefix where object is stored
var $id;
/**
* @var int ID
*/
public $id;
var $code;
var $code_iso;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $active;

View File

@ -4,8 +4,15 @@
*/
class Comment extends CommonObject
{
public $element='comment'; //!< Id that identify managed objects
public $table_element='comment'; //!< Name of table without prefix where object is stored
/**
* @var string ID to identify managed object
*/
public $element='comment';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='comment';
public $fk_element;
public $element_type;

View File

@ -46,47 +46,58 @@ abstract class CommonObject
* @var DoliDb Database handler (result of a new DoliDB)
*/
public $db;
/**
* @var int The object identifier
*/
public $id;
/**
* @var string Error string
* @see errors
*/
public $error;
/**
* @var string[] Array of error strings
*/
public $errors=array();
/**
* @var string
* @var string ID to identify managed object
*/
public $element;
/**
* @var string
* @var string Name of table without prefix where object is stored
*/
public $table_element;
/**
* @var
*/
public $table_element_line;
/**
* @var string Key value used to track if data is coming from import wizard
*/
public $import_key;
/**
* @var mixed Contains data to manage extrafields
*/
public $array_options=array();
/**
* @var int[][] Array of linked objects ids. Loaded by ->fetchObjectLinked
*/
public $linkedObjectsIds;
/**
* @var mixed Array of linked objects. Loaded by ->fetchObjectLinked
*/
public $linkedObjects;
/**
* @var Object To store a cloned copy of object before to edit it and keep track of old properties
*/
@ -116,11 +127,13 @@ abstract class CommonObject
* @see fetch_projet()
*/
public $project;
/**
* @var int The related project ID
* @see setProject(), project
*/
public $fk_project;
/**
* @deprecated
* @see project
@ -132,6 +145,7 @@ abstract class CommonObject
* @see fetch_contact()
*/
public $contact;
/**
* @var int The related contact ID
* @see fetch_contact()
@ -165,14 +179,17 @@ abstract class CommonObject
* @var string The object's reference
*/
public $ref;
/**
* @var string The object's previous reference
*/
public $ref_previous;
/**
* @var string The object's next reference
*/
public $ref_next;
/**
* @var string An external reference for the object
*/
@ -189,36 +206,43 @@ abstract class CommonObject
* @see getFullAddress()
*/
public $country;
/**
* @var int
* @see getFullAddress(), country
*/
public $country_id;
/**
* @var string
* @see getFullAddress(), isInEEC(), country
*/
public $country_code;
/**
* @var string
* @see getFullAddress()
*/
public $state;
/**
* @var int
* @see getFullAddress(), state
*/
public $state_id;
/**
* @var string
* @see getFullAddress(), state
*/
public $state_code;
/**
* @var string
* @see getFullAddress(), region
*/
public $region;
/**
* @var string
* @see getFullAddress(), region
@ -230,16 +254,19 @@ abstract class CommonObject
* @see fetch_barcode()
*/
public $barcode_type;
/**
* @var string
* @see fetch_barcode(), barcode_type
*/
public $barcode_type_code;
/**
* @var string
* @see fetch_barcode(), barcode_type
*/
public $barcode_type_label;
/**
* @var string
* @see fetch_barcode(), barcode_type
@ -257,6 +284,7 @@ abstract class CommonObject
* @see setPaymentTerms()
*/
public $cond_reglement_id;
/**
* @var int Payment terms ID
* @deprecated Kept for compatibility
@ -294,11 +322,13 @@ abstract class CommonObject
* @see update_note()
*/
public $note_public;
/**
* @var string Private note
* @see update_note()
*/
public $note_private;
/**
* @deprecated
* @see note_public
@ -310,21 +340,25 @@ abstract class CommonObject
* @see update_price()
*/
public $total_ht;
/**
* @var float Total VAT amount
* @see update_price()
*/
public $total_tva;
/**
* @var float Total local tax 1 amount
* @see update_price()
*/
public $total_localtax1;
/**
* @var float Total local tax 2 amount
* @see update_price()
*/
public $total_localtax2;
/**
* @var float Total amount with taxes
* @see update_price()
@ -347,11 +381,13 @@ abstract class CommonObject
* @see setIncoterms()
*/
public $fk_incoterms;
/**
* @var string
* @see SetIncoterms()
*/
public $libelle_incoterms;
/**
* @var string
* @see display_incoterms()

View File

@ -35,8 +35,12 @@ class Conf
/** \public */
//! To store properties found in conf file
var $file;
//! Object with database handler
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
//! To store properties found into database
var $global;
//! To store browser info

View File

@ -32,8 +32,15 @@
*/
class Cstate // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
@ -43,7 +50,11 @@ class Cstate // extends CommonObject
//var $element='cstate'; //!< Id that identify managed objects
//var $table_element='cstate'; //!< Name of table without prefix where object is stored
var $id;
/**
* @var int ID
*/
public $id;
var $code_departement;
var $nom;
var $active;

View File

@ -27,8 +27,15 @@
*/
class Ctypent // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* @var string[] Error codes (or messages)
@ -38,7 +45,11 @@ class Ctypent // extends CommonObject
//var $element='ctypent'; //!< Id that identify managed objects
//var $table_element='ctypent'; //!< Name of table without prefix where object is stored
var $id;
/**
* @var int ID
*/
public $id;
var $code;
var $libelle;
var $active;

View File

@ -36,6 +36,7 @@ class Ctyperesource
* @var string Id to identify managed objects
*/
public $element = 'ctyperesource';
/**
* @var string Name of table without prefix where object is stored
*/
@ -46,16 +47,10 @@ class Ctyperesource
*/
public $lines = array();
/**
*/
public $code;
public $label;
public $active;
/**
*/
/**
* Constructor

View File

@ -28,8 +28,15 @@
*/
class DiscountAbsolute
{
/**
* @var DoliDB Database handler.
*/
public $db;
public $error;
/**
* @var string Error code (or message)
*/
public $error;
public $id; // Id discount
public $fk_soc;

View File

@ -69,7 +69,11 @@ class DolGraph
var $showpercent=0;
var $combine=0; // 0.05 if you want to combine records < 5% into "other"
var $graph; // Objet Graph (Artichow, Phplot...)
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
var $bordercolor; // array(R,G,B)
var $bgcolor; // array(R,G,B)

View File

@ -105,16 +105,25 @@ class dolReceiptPrinter extends Escpos
const CONNECTOR_NETWORK_PRINT = 3;
const CONNECTOR_WINDOWS_PRINT = 4;
//const CONNECTOR_JAVA = 5;
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
var $tags;
var $printer;
var $template;
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
public $errors = array();

View File

@ -39,14 +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
*/

View File

@ -34,13 +34,30 @@
*/
class Events // extends CommonObject
{
public $element='events'; //!< Id that identify managed objects
public $table_element='events'; //!< Name of table without prefix where object is stored
/**
* @var string ID to identify managed object
*/
public $element='events';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='events';
var $id;
var $db;
/**
* @var int ID
*/
public $id;
/**
* @var DoliDB Database handler.
*/
public $db;
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
var $tms;
var $type;

View File

@ -37,7 +37,10 @@
*/
class ExtraFields
{
var $db;
/**
* @var DoliDB Database handler.
*/
public $db;
// type of element (for what object is the extrafield)
// @deprecated
@ -88,7 +91,11 @@ class ExtraFields
// New array to store extrafields definition
var $attributes;
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
var $errno;

View File

@ -28,15 +28,27 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class Fiscalyear extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='fiscalyear';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='accounting_fiscalyear';
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 $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $date_start;
var $date_end;
var $datec;

Some files were not shown because too many files have changed in this diff Show More