Standardize and update code

This commit is contained in:
Philippe GRAND 2018-09-04 13:45:20 +02:00
parent 42565e722e
commit 47b6374abc
2 changed files with 68 additions and 60 deletions

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

View File

@ -38,29 +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;
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