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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Philippe Grand 2018-09-04 16:58:59 +02:00 committed by GitHub
commit c32c67ca57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 219 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/accountancy/class/accountingaccount.class.php
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';
/** /**

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

@ -42,6 +42,10 @@ class AccountingJournal extends CommonObject
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';
/** /**

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

@ -53,66 +53,69 @@ 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 * @var int Entity

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

@ -42,7 +42,11 @@ class AdherentType extends CommonObject
*/ */
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();

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

@ -42,15 +42,18 @@ class Subscription extends CommonObject
*/ */
public $table_element='subscription'; public $table_element='subscription';
public $picto='payment'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment';
var $datec; // Date creation public $datec; // Date creation
var $datem; // Date modification public $datem; // Date modification
var $dateh; // Subscription start date (date subscription) public $dateh; // Subscription start date (date subscription)
var $datef; // Subscription end date public $datef; // Subscription end date
var $fk_adherent; public $fk_adherent;
var $amount; public $amount;
var $fk_bank; public $fk_bank;
/** /**

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

@ -109,12 +109,16 @@ class Asset extends CommonObject
public $entity; public $entity;
/** /**
* @var string Asset label * @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 * @var string description

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

@ -39,19 +39,28 @@ class AssetType extends CommonObject
*/ */
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();

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

@ -29,9 +29,9 @@
class Bookmark extends CommonObject 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
@ -39,7 +39,11 @@ class Bookmark extends CommonObject
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.
@ -52,16 +56,16 @@ class Bookmark extends CommonObject
public $id; public $id;
/** /**
* @var int User ID * @var int User ID
*/ */
public $fk_user; public $fk_user;
var $datec; public $datec;
var $url; public $url;
var $target; // 0=replace, 1=new window public $target; // 0=replace, 1=new window
var $title; public $title;
var $position; public $position;
var $favicon; public $favicon;
/** /**

5
htdocs/categories/class/categorie.class.php
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';

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

@ -45,7 +45,11 @@ class ActionComm extends CommonObject
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
@ -63,7 +67,7 @@ class ActionComm extends CommonObject
* Id of the event * Id of the event
* @var int * @var int
*/ */
public $id; public $id;
/** /**
* Id of the event. Use $id as possible * Id of the event. Use $id as possible

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

@ -54,7 +54,11 @@ class CActionComm
public $active; public $active;
public $color; public $color;
public $picto;
/**
* @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(); public $type_actions=array();

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

@ -41,33 +41,36 @@ class Mailing extends CommonObject
*/ */
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();

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

@ -65,6 +65,9 @@ class Propal extends CommonObject
*/ */
public $fk_element ='fk_propal'; 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';
/** /**

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

@ -34,9 +34,9 @@ class DiscountAbsolute
public $db; public $db;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error; public $error;
/** /**
* @var string[] Array of error strings * @var string[] Array of error strings
@ -48,7 +48,11 @@ class DiscountAbsolute
*/ */
public $id; 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; //
@ -56,14 +60,14 @@ class DiscountAbsolute
public $tva_tx; // Vat rate public $tva_tx; // Vat rate
/** /**
* @var int User ID Id utilisateur qui accorde la remise * @var int User ID Id utilisateur qui accorde la remise
*/ */
public $fk_user; public $fk_user;
/** /**
* @var string description * @var string description
*/ */
public $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)

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

@ -38,29 +38,35 @@ 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;
public $recuperableonly;
public $localtax1_type;
public $localtax1_tx;
public $localtax2_type;
public $localtax2_tx;
/** /**
* @var int User ID * @var int User ID
*/ */
public $fk_user; public $fk_user;
var $lines = array (); public $lines = array ();
/** /**
* Constructor * Constructor
@ -974,7 +980,12 @@ class PriceByCustomerLine
public $datec = ''; public $datec = '';
public $tms = ''; public $tms = '';
public $fk_product; public $fk_product;
public $fk_soc;
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $price; public $price;
public $price_ttc; public $price_ttc;
public $price_min; public $price_min;

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

@ -124,7 +124,11 @@ class CompanyPaymentMode extends CommonObject
*/ */
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;

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

@ -111,7 +111,12 @@ class SocieteAccount extends CommonObject
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;

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

@ -33,7 +33,10 @@ class Stripe extends CommonObject
*/ */
public $rowid; public $rowid;
public $fk_soc; /**
* @var int Thirdparty ID
*/
public $fk_soc;
public $fk_key; public $fk_key;

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

@ -68,6 +68,10 @@ class ActionsTicket
public $description; public $description;
public $fk_statut; public $fk_statut;
/**
* @var int Thirdparty ID
*/
public $fk_soc; public $fk_soc;
/** /**

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

@ -2502,8 +2502,8 @@ class TicketsLine
public $track_id; public $track_id;
/** /**
* Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
/** /**