Merge pull request #9399 from grandoc/new_branch_03_09_2018

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

View File

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

View File

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

View File

@ -37,6 +37,9 @@ class AccountingAccount extends CommonObject
*/ */
public $table_element='accounting_account'; 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'; public $picto = 'billr';
/** /**
@ -71,14 +74,19 @@ class AccountingAccount extends CommonObject
*/ */
public $id; public $id;
var $rowid; /**
var $datec; // Creation date * @var int ID
var $fk_pcg_version; */
var $pcg_type; public $rowid;
var $pcg_subtype;
var $account_number; public $datec; // Creation date
var $account_parent; public $fk_pcg_version;
var $account_category; public $pcg_type;
public $pcg_subtype;
public $account_number;
public $account_parent;
public $account_category;
public $status;
/** /**
* @var string Label of account * @var string Label of account
@ -96,7 +104,6 @@ class AccountingAccount extends CommonObject
public $fk_user_modif; public $fk_user_modif;
public $active; // duplicate with status public $active; // duplicate with status
public $status;
/** /**

View File

@ -36,16 +36,27 @@ class AccountingJournal extends CommonObject
*/ */
public $table_element='accounting_journal'; public $table_element='accounting_journal';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = ''; public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe 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'; public $picto = 'generic';
/**
* @var int ID
*/
public $rowid; public $rowid;
public $code; public $code;
/** /**
* @var string proper name for given parameter * @var string Accounting Journal label
*/ */
public $label; public $label;

View File

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

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

View File

@ -36,13 +36,17 @@ class AdherentType extends CommonObject
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'adherent_type'; public $table_element = 'adherent_type';
/** /**
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'adherent_type'; 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 $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/** /**
@ -51,19 +55,25 @@ class AdherentType extends CommonObject
* @see label * @see label
*/ */
public $libelle; public $libelle;
/** @var string Label */ /** @var string Label */
public $label; public $label;
/** /**
* @var int Subsription required (0 or 1) * @var int Subsription required (0 or 1)
* @since 5.0 * @since 5.0
*/ */
public $subscription; public $subscription;
/** @var string Public note */ /** @var string Public note */
public $note; public $note;
/** @var integer Can vote */ /** @var integer Can vote */
public $vote; public $vote;
/** @var string Email sent during validation */ /** @var string Email sent during validation */
public $mail_valid; public $mail_valid;
/** @var array Array of members */ /** @var array Array of members */
public $members=array(); public $members=array();

View File

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

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,), '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')), '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; public $rowid;
/**
* @var string Ref
*/
public $ref; public $ref;
public $entity; public $entity;
/** /**
* @var string proper name for given parameter * @var string Asset label
*/ */
public $label; public $label;
public $amount; public $amount;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
/**
* @var string description
*/
public $description; public $description;
public $note_public; public $note_public;
public $note_private; public $note_private;
public $date_creation; public $date_creation;

View File

@ -33,25 +33,34 @@ class AssetType extends CommonObject
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'asset_type'; public $table_element = 'asset_type';
/** /**
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'asset_type'; 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 $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/** @var string Label */ /** @var string Label */
public $label; public $label;
/** @var string Accountancy code asset */ /** @var string Accountancy code asset */
public $accountancy_code_asset; public $accountancy_code_asset;
/** @var string Accountancy code depreciation asset */ /** @var string Accountancy code depreciation asset */
public $accountancy_code_depreciation_asset; public $accountancy_code_depreciation_asset;
/** @var string Accountancy code depreciation expense */ /** @var string Accountancy code depreciation expense */
public $accountancy_code_depreciation_expense; public $accountancy_code_depreciation_expense;
/** @var string Public note */ /** @var string Public note */
public $note; public $note;
/** @var array Array of asset */ /** @var array Array of asset */
public $asset=array(); public $asset=array();

View File

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

View File

@ -32,14 +32,18 @@ class Bookmark extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='bookmark'; public $element='bookmark';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='bookmark'; public $table_element='bookmark';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = '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. * @var DoliDB Database handler.
@ -50,14 +54,18 @@ class Bookmark extends CommonObject
* @var int ID * @var int ID
*/ */
public $id; public $id;
var $fk_user; /**
var $datec; * @var int User ID
var $url; */
var $target; // 0=replace, 1=new window public $fk_user;
var $title;
var $position; public $datec;
var $favicon; public $url;
public $target; // 0=replace, 1=new window
public $title;
public $position;
public $favicon;
/** /**

View File

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

View File

@ -51,8 +51,11 @@ class Categorie extends CommonObject
const TYPE_USER = 'user'; const TYPE_USER = 'user';
const TYPE_PROJECT = 'project'; const TYPE_PROJECT = 'project';
const TYPE_ACCOUNT = 'bank_account'; 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'; public $picto = 'category';
@ -161,11 +164,15 @@ class Categorie extends CommonObject
public $fk_parent; public $fk_parent;
/** /**
* @var string proper name for given parameter * @var string Category label
*/ */
public $label; public $label;
/**
* @var string description
*/
public $description; public $description;
/** /**
* @var string Color * @var string Color
*/ */

View File

@ -38,21 +38,25 @@ class ActionComm extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='action'; public $element='action';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'actioncomm'; public $table_element = 'actioncomm';
public $table_rowid = 'id'; 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 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; 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 * 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 * @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 $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; public $label;

View File

@ -34,17 +34,17 @@ class ActionCommReminder extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'actioncomm_reminder'; public $element = 'actioncomm_reminder';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'actioncomm_reminder'; 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 * @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; public $ismultientitymanaged = 0;
/** /**
* @var string String with name of icon for actioncommreminder. Must be the part after the 'object_' into object_actioncommreminder.png * @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 $rowid;
public $dateremind; public $dateremind;
public $typeremind; public $typeremind;
/**
* @var int User ID
*/
public $fk_user; public $fk_user;
public $offsetvalue; public $offsetvalue;
public $offsetunit; public $offsetunit;
public $status; public $status;

View File

@ -32,7 +32,7 @@ class CActionComm
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
@ -43,20 +43,24 @@ class CActionComm
*/ */
public $id; public $id;
var $code; public $code;
var $type; public $type;
var $libelle; // deprecated public $libelle; // deprecated
/** /**
* @var string proper name for given parameter * @var string Type of agenda event label
*/ */
public $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();
/** /**

View File

@ -35,39 +35,42 @@ class Mailing extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='mailing'; public $element='mailing';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='mailing'; 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'; public $picto='email';
var $titre; public $titre;
var $sujet; public $sujet;
var $body; public $body;
var $nbemail; public $nbemail;
var $bgcolor; public $bgcolor;
var $bgimage; 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; public $email_from;
var $email_replyto; public $email_replyto;
var $email_errorsto; public $email_errorsto;
var $joined_file1; public $joined_file1;
var $joined_file2; public $joined_file2;
var $joined_file3; public $joined_file3;
var $joined_file4; public $joined_file4;
var $user_creat; public $user_creat;
var $user_valid; public $user_valid;
var $date_creat; public $date_creat;
var $date_valid; public $date_valid;
var $extraparams=array(); public $extraparams=array();
public $statut_dest=array(); public $statut_dest=array();
public $statuts=array(); public $statuts=array();

View File

@ -55,8 +55,19 @@ class Propal extends CommonObject
*/ */
public $table_element='propal'; public $table_element='propal';
/**
* @var int Name of subtable line
*/
public $table_element_line='propaldet'; 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'; public $picto='propal';
/** /**

View File

@ -52,15 +52,26 @@ class Commande extends CommonOrder
*/ */
public $table_element='commande'; public $table_element='commande';
/**
* @var int Name of subtable line
*/
public $table_element_line = 'commandedet'; public $table_element_line = 'commandedet';
public $class_element_line = 'OrderLine'; 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 $fk_element = 'fk_commande';
public $picto = 'order'; public $picto = 'order';
/** /**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; 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 * 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 * @var integer
@ -87,6 +98,7 @@ class Commande extends CommonOrder
* @var int * @var int
*/ */
public $statut; public $statut;
/** /**
* Billed * Billed
* @var int * @var int
@ -109,21 +121,25 @@ class Commande extends CommonOrder
* @var int * @var int
*/ */
public $mode_reglement_id; public $mode_reglement_id;
/** /**
* Payment mode code * Payment mode code
* @var string * @var string
*/ */
public $mode_reglement_code; public $mode_reglement_code;
/** /**
* Availability delivery time id * Availability delivery time id
* @var int * @var int
*/ */
public $availability_id; public $availability_id;
/** /**
* Availability delivery time code * Availability delivery time code
* @var string * @var string
*/ */
public $availability_code; public $availability_code;
/** /**
* Label of availability delivery time. Use it in case translation cannot be found. * Label of availability delivery time. Use it in case translation cannot be found.
* @var string * @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_id; // Source reason. Why we receive order (after a phone campaign, ...)
public $demand_reason_code; public $demand_reason_code;
public $date; // Date commande public $date; // Date commande
/** /**
* @deprecated * @deprecated
* @see date * @see date
*/ */
public $date_commande; public $date_commande;
public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after) public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
public $fk_remise_except; public $fk_remise_except;
public $remise_percent; public $remise_percent;
@ -3832,7 +3850,7 @@ class OrderLine extends CommonOrderLine
var $fk_facture; var $fk_facture;
/** /**
* @var string proper name for given parameter * @var string Order lines label
*/ */
public $label; public $label;

View File

@ -40,12 +40,12 @@ class Account extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'bank_account'; public $element = 'bank_account';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'bank_account'; public $table_element = 'bank_account';
public $picto = 'account'; public $picto = 'account';
/** /**
@ -1648,56 +1648,60 @@ class AccountLine extends CommonObject
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
/** /**
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='bank'; public $element='bank';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='bank'; public $table_element='bank';
var $picto = 'generic'; public $picto = 'generic';
/** /**
* @var int ID * @var int ID
*/ */
public $id; public $id;
var $ref; /**
var $datec; * @var string Ref
var $dateo; */
public $ref;
public $datec;
public $dateo;
/** /**
* Value date * Value date
*/ */
var $datev; public $datev;
var $amount; public $amount;
/** /**
* @var string proper name for given parameter * @var string bank transaction lines label
*/ */
public $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 public $note;
var $bank_account_label; // Label of bank account 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; public $emetteur;

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 $table_element='bank_categ'; //!< Name of table without prefix where object is stored
public $picto='generic'; public $picto='generic';
public $id; /**
* @var int ID
*/
public $id;
/** /**
* @var string proper name for given parameter * @var string bank categories label
*/ */
public $label; public $label;

View File

@ -34,38 +34,42 @@ class PaymentVarious extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='variouspayment'; public $element='variouspayment';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='payment_various'; public $table_element='payment_various';
public $picto = 'bill'; public $picto = 'bill';
/** /**
* @var int ID * @var int ID
*/ */
public $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; public $label;
var $accountancy_code; public $accountancy_code;
var $fk_project; public $fk_project;
var $fk_bank; public $fk_bank;
var $fk_user_author; public $fk_user_author;
var $fk_user_modif; public $fk_user_modif;
/** /**

View File

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

View File

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

View File

@ -63,14 +63,24 @@ class Facture extends CommonInvoice
*/ */
public $table_element='facture'; public $table_element='facture';
/**
* @var int Name of subtable line
*/
public $table_element_line = 'facturedet'; 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 $fk_element = 'fk_facture';
public $picto='bill'; public $picto='bill';
/** /**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; 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 * 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 * @var integer
@ -120,14 +130,17 @@ class Facture extends CommonInvoice
public $cond_reglement_code; // Code in llx_c_paiement public $cond_reglement_code; // Code in llx_c_paiement
public $mode_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 public $fk_bank; // Field to store bank id to use when payment mode is withdraw
/** /**
* @deprecated * @deprecated
*/ */
public $products=array(); public $products=array();
/** /**
* @var FactureLigne[] * @var FactureLigne[]
*/ */
public $lines=array(); public $lines=array();
public $line; public $line;
public $extraparams=array(); public $extraparams=array();
public $specimen; public $specimen;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -31,9 +31,16 @@ class Comment extends CommonObject
*/ */
public $table_element='comment'; 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; public $element_type;
/**
* @var string description
*/
public $description; public $description;
public $tms; public $tms;
@ -42,6 +49,9 @@ class Comment extends CommonObject
public $fk_user_author; public $fk_user_author;
/**
* @var int Entity
*/
public $entity; public $entity;
public $import_key; public $import_key;

View File

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

View File

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

View File

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

View File

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

View File

@ -32,7 +32,7 @@ class DiscountAbsolute
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
@ -43,15 +43,32 @@ class DiscountAbsolute
*/ */
public $errors=array(); public $errors=array();
public $id; // Id discount /**
* @var int ID discount
*/
public $id;
/**
* @var int Thirdparty ID
*/
public $fk_soc; public $fk_soc;
public $discount_type; // 0 => customer discount, 1 => supplier discount public $discount_type; // 0 => customer discount, 1 => supplier discount
public $amount_ht; // public $amount_ht; //
public $amount_tva; // public $amount_tva; //
public $amount_ttc; // public $amount_ttc; //
public $tva_tx; // Vat rate 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 $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_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) public $fk_facture; // Id invoice when a discount line is used into an invoice (for credit note)

View File

@ -39,17 +39,17 @@ class EmailSenderProfile extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'emailsenderprofile'; public $element = 'emailsenderprofile';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'c_email_senderprofile'; 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 * @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; public $ismultientitymanaged = 1;
/** /**
* @var string String with name of icon for emailsenderprofile * @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,), '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), 'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
); );
/**
* @var int ID
*/
public $rowid; public $rowid;
/**
* @var int Entity
*/
public $entity; public $entity;
public $label; public $label;
public $email; public $email;
public $date_creation; public $date_creation;

View File

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

View File

@ -38,25 +38,36 @@ class Fiscalyear extends CommonObject
*/ */
public $table_element='accounting_fiscalyear'; public $table_element='accounting_fiscalyear';
/**
* @var int Name of subtable line
*/
public $table_element_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; public $label;
var $date_start; public $date_start;
var $date_end; public $date_end;
var $datec; public $datec;
var $statut; // 0=open, 1=closed public $statut; // 0=open, 1=closed
var $entity; public $entity;
var $statuts=array(); public $statuts=array();
var $statuts_short=array(); public $statuts_short=array();
/** /**
* Constructor * Constructor

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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 $table_element='commande_fournisseur_dispatch'; //!< Name of table without prefix where object is stored
public $lines=array(); public $lines=array();
public $id; /**
* @var int ID
*/
public $id;
public $fk_commande; public $fk_commande;
public $fk_product; public $fk_product;
public $fk_commandefourndet; public $fk_commandefourndet;
public $qty; public $qty;
public $fk_entrepot; public $fk_entrepot;
/**
* @var int User ID
*/
public $fk_user; public $fk_user;
public $datec=''; public $datec='';
public $comment; public $comment;
public $status; public $status;

View File

@ -5,7 +5,7 @@
* Copyright (C) 2005 Marc Barilley <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley <marc@ocebo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2017 Juanjo Menent <jmenent@2byte.es> * 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) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2016 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Bahfir Abbes <bafbes@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='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'; public $picto='bill';
/** /**
@ -72,8 +80,16 @@ class FactureFournisseur extends CommonInvoice
*/ */
protected $table_ref_field = 'ref'; protected $table_ref_field = 'ref';
public $rowid; /**
public $ref; * @var int ID
*/
public $rowid;
/**
* @var string Ref
*/
public $ref;
public $product_ref; public $product_ref;
public $ref_supplier; public $ref_supplier;
public $socid; public $socid;
@ -131,6 +147,7 @@ class FactureFournisseur extends CommonInvoice
* @var SupplierInvoiceLine[] * @var SupplierInvoiceLine[]
*/ */
public $lines = array(); public $lines = array();
/** /**
* @deprecated * @deprecated
*/ */

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -36,22 +36,22 @@ class MyObject extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'myobject'; public $element = 'myobject';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'mymodule_myobject'; 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 * @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; public $ismultientitymanaged = 0;
/** /**
* @var int Does myobject support extrafields ? 0=No, 1=Yes * @var int Does myobject support extrafields ? 0=No, 1=Yes
*/ */
public $isextrafieldmanaged = 1; public $isextrafieldmanaged = 1;
/** /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png * @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')), '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; public $rowid;
/**
* @var string Ref
*/
public $ref; public $ref;
/**
* @var int Entity
*/
public $entity; public $entity;
public $label; public $label;
public $amount; public $amount;
public $status; public $status;
@ -122,22 +134,22 @@ class MyObject extends CommonObject
* @var int Name of subtable line * @var int Name of subtable line
*/ */
//public $table_element_line = 'myobjectdet'; //public $table_element_line = 'myobjectdet';
/** /**
* @var int Field with ID of parent key if this field has a parent * @var int Field with ID of parent key if this field has a parent
*/ */
//public $fk_element = 'fk_myobject'; //public $fk_element = 'fk_myobject';
/** /**
* @var int Name of subtable class that manage subtable lines * @var int Name of subtable class that manage subtable lines
*/ */
//public $class_element_line = 'MyObjectline'; //public $class_element_line = 'MyObjectline';
/** /**
* @var array Array of child tables (child tables to delete before deleting a record) * @var array Array of child tables (child tables to delete before deleting a record)
*/ */
//protected $childtables=array('myobjectdet'); //protected $childtables=array('myobjectdet');
/** /**
* @var MyObjectLine[] Array of subtable lines * @var MyObjectLine[] Array of subtable lines
*/ */

View File

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

View File

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

View File

@ -53,7 +53,11 @@ class Product extends CommonObject
*/ */
public $table_element='product'; public $table_element='product';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_product'; 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 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 public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -38,7 +38,7 @@ class Inventory extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'inventory'; public $element = 'inventory';
/** /**
* @var string Name of table without prefix where object is stored * @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 * @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; public $ismultientitymanaged = 1;
/** /**
* @var string String with name of icon for inventory * @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')), '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; public $rowid;
/**
* @var string Ref
*/
public $ref; public $ref;
/**
* @var int Entity
*/
public $entity; public $entity;
public $fk_warehouse; public $fk_warehouse;
public $date_inventory; public $date_inventory;
public $title; public $title;
@ -123,22 +135,22 @@ class Inventory extends CommonObject
* @var int Name of subtable line * @var int Name of subtable line
*/ */
//public $table_element_line = 'inventorydet'; //public $table_element_line = 'inventorydet';
/** /**
* @var int Field with ID of parent key if this field has a parent * @var int Field with ID of parent key if this field has a parent
*/ */
//public $fk_element = 'fk_inventory'; //public $fk_element = 'fk_inventory';
/** /**
* @var int Name of subtable class that manage subtable lines * @var int Name of subtable class that manage subtable lines
*/ */
//public $class_element_line = 'Inventoryline'; //public $class_element_line = 'Inventoryline';
/** /**
* @var array Array of child tables (child tables to delete before deleting a record) * @var array Array of child tables (child tables to delete before deleting a record)
*/ */
//protected $childtables=array('inventorydet'); //protected $childtables=array('inventorydet');
/** /**
* @var InventoryLine[] Array of subtable lines * @var InventoryLine[] Array of subtable lines
*/ */
@ -471,10 +483,12 @@ class InventoryObjectLine
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var mixed Sample line property 1 * @var mixed Sample line property 1
*/ */
public $prop1; public $prop1;
/** /**
* @var mixed Sample line property 2 * @var mixed Sample line property 2
*/ */

View File

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

View File

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

View File

@ -43,8 +43,16 @@ class Project extends CommonObject
*/ */
public $table_element = 'projet'; 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 $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'projectpub'; public $picto = 'projectpub';
@ -53,38 +61,43 @@ class Project extends CommonObject
*/ */
protected $table_ref_field = 'ref'; protected $table_ref_field = 'ref';
var $description; /**
* @var string description
*/
public $description;
/** /**
* @var string * @var string
* @deprecated * @deprecated
* @see title * @see title
*/ */
public $titre; public $titre;
var $title;
var $date_start;
var $date_end;
var $date_close;
var $socid; // To store id of thirdparty public $title;
var $thirdparty_name; // To store name of thirdparty (defined only in some cases) public $date_start;
public $date_end;
public $date_close;
var $user_author_id; //!< Id of project creator. Not defined if shared project. public $socid; // To store id of thirdparty
var $user_close_id; public $thirdparty_name; // To store name of thirdparty (defined only in some cases)
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
var $statuts_short; public $user_author_id; //!< Id of project creator. Not defined if shared project.
var $statuts_long; 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 public $statuts_short;
var $opp_status; // opportunity status, into table llx_c_lead_status public $statuts_long;
var $opp_percent; // opportunity probability
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 public $oldcopy;
var $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
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 * @var int Creation date
@ -92,16 +105,19 @@ class Project extends CommonObject
* @see date_c * @see date_c
*/ */
public $datec; public $datec;
/** /**
* @var int Creation date * @var int Creation date
*/ */
public $date_c; public $date_c;
/** /**
* @var int Modification date * @var int Modification date
* @deprecated * @deprecated
* @see date_m * @see date_m
*/ */
public $datem; public $datem;
/** /**
* @var int Modification date * @var int Modification date
*/ */
@ -116,10 +132,12 @@ class Project extends CommonObject
* Draft status * Draft status
*/ */
const STATUS_DRAFT = 0; const STATUS_DRAFT = 0;
/** /**
* Open/Validated status * Open/Validated status
*/ */
const STATUS_VALIDATED = 1; const STATUS_VALIDATED = 1;
/** /**
* Closed status * Closed status
*/ */

View File

@ -41,7 +41,11 @@ class Task extends CommonObject
*/ */
public $table_element='projet_task'; 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 $fk_element='fk_task';
public $picto = 'task'; public $picto = 'task';
protected $childtables=array('projet_task_time'); // To test if we can delete object protected $childtables=array('projet_task_time'); // To test if we can delete object
@ -52,7 +56,11 @@ class Task extends CommonObject
*/ */
public $label; public $label;
var $description; /**
* @var string description
*/
public $description;
var $duration_effective; // total of time spent on this task var $duration_effective; // total of time spent on this task
var $planned_workload; var $planned_workload;
var $date_c; var $date_c;

View File

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

View File

@ -36,22 +36,22 @@ class CompanyPaymentMode extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'companypaymentmode'; public $element = 'companypaymentmode';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'societe_rib'; 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 * @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; public $ismultientitymanaged = 2;
/** /**
* @var int Does companypaymentmode support extrafields ? 0=No, 1=Yes * @var int Does companypaymentmode support extrafields ? 0=No, 1=Yes
*/ */
public $isextrafieldmanaged = 0; public $isextrafieldmanaged = 0;
/** /**
* @var string String with name of icon for companypaymentmode. Must be the part after the 'object_' into object_companypaymentmode.png * @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), '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), //'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
); );
/**
* @var int ID
*/
public $rowid; public $rowid;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $label; public $label;
public $bank; public $bank;
public $code_banque; public $code_banque;

View File

@ -51,7 +51,11 @@ class Societe extends CommonObject
*/ */
public $table_element = 'societe'; public $table_element = 'societe';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_soc'; public $fk_element='fk_soc';
public $fieldsforcombobox='nom,name_alias'; 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 $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"); 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; public $entity;
/** /**
@ -374,7 +381,11 @@ class Societe extends CommonObject
*/ */
public $default_lang; public $default_lang;
/**
* @var string Ref
*/
public $ref; public $ref;
public $ref_int; public $ref_int;
/** /**
* External user reference. * External user reference.

View File

@ -39,17 +39,17 @@ class SocieteAccount extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'societeaccount'; public $element = 'societeaccount';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'societe_account'; 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 * @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; public $ismultientitymanaged = 0;
/** /**
* @var string String with name of icon for societeaccount. Must be the part after the 'object_' into object_myobject.png * @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')), '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; public $rowid;
/**
* @var int Entity
*/
public $entity; public $entity;
public $key_account; public $key_account;
public $login; public $login;
public $pass_encoding; public $pass_encoding;
public $pass_crypted; public $pass_crypted;
public $pass_temp; public $pass_temp;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $site; public $site;
public $date_last_login; public $date_last_login;
public $date_previous_login; public $date_previous_login;

View File

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

View File

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

View File

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

View File

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

View File

@ -57,7 +57,10 @@ class Ticketlogs// extends CommonObject
*/ */
public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored 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_track_id;
public $fk_user_create; public $fk_user_create;

View File

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

View File

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

View File

@ -39,57 +39,57 @@ class Website extends CommonObject
* @var string Id to identify managed objects * @var string Id to identify managed objects
*/ */
public $element = 'website'; public $element = 'website';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'website'; 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 * @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; public $ismultientitymanaged = 1;
/** /**
* @var string String with name of icon for website. Must be the part after the 'object_' into object_myobject.png * @var string String with name of icon for website. Must be the part after the 'object_' into object_myobject.png
*/ */
public $picto = 'globe'; public $picto = 'globe';
/** /**
* @var int * @var int Entity
*/ */
public $entity; public $entity;
/** /**
* @var string * @var string Ref
*/ */
public $ref; public $ref;
/** /**
* @var string * @var string description
*/ */
public $description; public $description;
/** /**
* @var int * @var int Status
*/ */
public $status; public $status;
/** /**
* @var mixed * @var mixed
*/ */
public $date_creation; public $date_creation;
/** /**
* @var mixed * @var mixed
*/ */
public $tms = ''; public $tms = '';
/** /**
* @var integer * @var integer
*/ */
public $fk_default_home; public $fk_default_home;
/** /**
* @var string * @var string
*/ */

View File

@ -39,12 +39,12 @@ class WebsitePage extends CommonObject
* @var string Id to identify managed objects * @var string Id to identify managed objects
*/ */
public $element = 'websitepage'; public $element = 'websitepage';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'website_page'; 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 * @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 $aliasalt;
public $type_container; public $type_container;
public $title; public $title;
/**
* @var string description
*/
public $description; public $description;
public $keywords; public $keywords;
public $htmlheader; public $htmlheader;
public $content; public $content;