[Qual] Cleanup of inherited class properties

2015-09-24 20:12:55 +02:00
parent ea7384cf68
commit 67ddb6c94e
68 changed files with 9 additions and 672 deletions
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -35,19 +35,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 * Class Skeleton_Class
 *
 * Put here description of your class
+ * @see CommonObject
 */
 class Skeleton_Class extends CommonObject
 {
-	/**
-	 * @var string Error code (or message)
-	 * @deprecated
-	 * @see Skeleton_Class::errors
-	 */
-	public $error;
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
 	/**
 	 * @var string Id to identify managed objects
 	 */
@@ -62,10 +53,6 @@ class Skeleton_Class extends CommonObject
 	 */
 	public $lines = array();

-	/**
-	 * @var int ID
-	 */
-	public $id;
 	/**
 	 * @var mixed Sample property 1
 	 */
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -30,11 +30,6 @@
 */
 class AccountingAccount extends CommonObject
 {
-	var $db;
-	var $error;
-	var $errors;
-
-	var $id;
 	var $rowid;

 	var $datec; // Creation date
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -29,11 +29,6 @@
 */
 class BookKeeping extends CommonObject
 {
-	var $db;
-	var $error;
-	var $errors;
-
-	var $id;
 	var $doc_date;
 	var $doc_type;
 	var $doc_ref;
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -30,12 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/canvas/actions_adherentcard_common.cl
 */
 class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 {
-	var $db;
-	var $dirmodule;
-    var $targetmodule;
-    var $canvas;
-    var $card;
-
 	/**
     *	Constructor
     *
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -44,18 +44,8 @@ class Adherent extends CommonObject
    public $table_element='adherent';
    protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-    var $error;
-    var $errors;
    var $mesgs;

-    var $id;
-
-    var $ref;
-    public $ref_ext;
-
-    var $civility_id;
-    var $firstname;
-    var $lastname;
    var $login;
    var $pass;
    var $societe;
@@ -68,10 +58,6 @@ class Adherent extends CommonObject
    var $state_code;            // Code of department
    var $state;                 // Label of department

-    var $country_id;
-    var $country_code;
-    var $country;
-
    var $email;
    var $skype;
    var $phone;
@@ -80,8 +66,6 @@ class Adherent extends CommonObject

    var $morphy;
    var $public;
-    var $note_private;		// Private note
-    var $note_public;       // Public note
    var $statut;			// -1:brouillon, 0:resilie, >=1:valide,paye
    var $photo;

@@ -99,7 +83,6 @@ class Adherent extends CommonObject
    var $user_login;

    var $fk_soc;
-	var $thirdparty;		// Loaded by ->fetch_thirdparty()

    // Fields loaded by fetch_subscriptions()
    var $first_subscription_date;
@@ -110,9 +93,6 @@ class Adherent extends CommonObject
    var $last_subscription_amount;
    var $subscriptions=array();

-    //  var $public;
-    var $array_options;
-
    var $oldcopy;		// To contains a clone of this when we need to save old properties of object

    public $entity;
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -35,18 +35,9 @@ class AdherentType extends CommonObject
    public $table_element = 'adherent_type';
    public $element = 'adherent_type';

-    var $id;
-
-    /**
-     * @var int
-     */
-    public $ref;
-
    var $libelle;
-    var $statut;
    var $cotisation;  // Soumis a la cotisation
    var $vote;		  // droit de vote
-    var $note; 		  // commentaire
    var $mail_valid;  //mail envoye lors de la validation


--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -33,16 +33,12 @@ class Cotisation extends CommonObject
 	public $element='subscription';
 	public $table_element='cotisation';

-	var $id;
-	var $ref;
-
 	var $datec;				// Date creation
 	var $datem;				// Date modification
 	var $dateh;				// Subscription start date (date subscription)
 	var $datef;				// Subscription end date
 	var $fk_adherent;
 	var $amount;
-	var $note;
 	var $fk_bank;


--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -112,7 +112,6 @@ class Categorie extends CommonObject
 	public $element='category';
 	public $table_element='categories';

-	var $id;
 	var $fk_parent;
 	var $label;
 	var $description;
@@ -134,7 +133,6 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_CONTACT
 	 */
 	var $type;
-	var $import_key;

 	var $cats=array();			// Tableau en memoire des categories
 	var $motherof=array();
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -107,7 +107,6 @@ class ActionComm extends CommonObject

 	var $transparency;	// Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
    var $priority;      // Small int (0 By default)
-    var $note;          // Description

 	var $userassigned = array();	// Array of user ids
    var $userownerid;	// Id of user owner = fk_user_action into table
@@ -148,12 +147,6 @@ class ActionComm extends CommonObject
     */
    var $contact;

-    /**
-     * Id of project (optional)
-     * @var int
-     */
-    var $fk_project;
-
    // Properties for links to other objects
    var $fk_element;    // Id of record
    var $elementtype;   // Type of record. This if property ->element of object linked to.
--- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
+++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
@@ -53,18 +53,13 @@ class AskPriceSupplier extends CommonObject
     */
    protected $table_ref_field = 'ref';

-    var $id;
-
    var $socid;		// Id client
-    var $client;		// Objet societe client (a charger par fetch_client)

-    var $fk_project;
 	/**
 	 * @deprecated
 	 * @see user_author_id
 	 */
    var $author;
-    var $ref;
 	var $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 (billed)
    var $date;						// Date of proposal
@@ -99,12 +94,6 @@ class AskPriceSupplier extends CommonObject
    var $user_valid_id;
    var $user_close_id;

-    var $total_ht;					// Total net of tax
-    var $total_tva;					// Total VAT
-    var $total_localtax1;			// Total Local Taxes 1
-    var $total_localtax2;			// Total Local Taxes 2
-    var $total_ttc;					// Total with tax
-
 	/**
 	 * @deprecated
 	 * @see price_ht
@@ -121,22 +110,11 @@ class AskPriceSupplier extends CommonObject
 	 */
    var $total;

-    var $cond_reglement_id;
    var $cond_reglement_code;
-    var $fk_account;				// Id of bank account
-    var $mode_reglement_id;
    var $mode_reglement_code;
    var $remise;
    var $remise_percent;
    var $remise_absolue;
-	/**
-	 * @deprecated
-	 * @see note_public, note_private
-	 */
-    var $note;
-    var $note_private;
-    var $note_public;
-    var $shipping_method_id;

    var $products=array();
    var $extraparams=array();
@@ -144,9 +122,6 @@ class AskPriceSupplier extends CommonObject
    var $lines = array();
    var $line;

-    var $origin;
-    var $origin_id;
-
    var $labelstatut=array();
    var $labelstatut_short=array();

--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -34,8 +34,6 @@ class Mailing extends CommonObject
 	public $element='mailing';
 	public $table_element='mailing';

-	var $id;
-	var $statut;
 	var $titre;
 	var $sujet;
 	var $body;
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -54,23 +54,14 @@ class Propal extends CommonObject
     */
    protected $table_ref_field = 'ref';

-    var $id;
-
 	/**
 	 * ID of the client
 	 * @var int
 	 */
    var $socid;
-	/**
-	 * Client (loaded by fetch_client)
-	 * @var Societe
-	 */
-    var $client;

    var $contactid;
-    var $fk_project;
    var $author;
-    var $ref;
    var $ref_client;

 	/**
@@ -122,12 +113,6 @@ class Propal extends CommonObject
    var $user_valid_id;
    var $user_close_id;

-    var $total_ht;					// Total net of tax
-    var $total_tva;					// Total VAT
-    var $total_localtax1;			// Total Local Taxes 1
-    var $total_localtax2;			// Total Local Taxes 2
-    var $total_ttc;					// Total with tax
-
 	/**
 	 * @deprecated
 	 * @see total_ht
@@ -144,29 +129,14 @@ class Propal extends CommonObject
 	 */
    var $total;

-    var $cond_reglement_id;
    var $cond_reglement_code;
-    var $fk_account;				// Id of bank account
-    var $mode_reglement_id;
    var $mode_reglement_code;
    var $remise;
    var $remise_percent;
    var $remise_absolue;
-	/**
-	 * @deprecated
-	 * @see note_private, note_public
-	 */
-    var $note;
-    var $note_private;
-    var $note_public;
-	/**
-	 * @deprecated
-	 */
-    var $fk_delivery_address;
    var $fk_address;
    var $address_type;
    var $address;
-    var $shipping_method_id;
    var $availability_id;
    var $availability_code;
    var $demand_reason_id;
@@ -181,19 +151,11 @@ class Propal extends CommonObject
    var $lines = array();
    var $line;

-    var $origin;
-    var $origin_id;
-
    var $labelstatut=array();
    var $labelstatut_short=array();

    var $specimen;

-	//Incorterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
-
 	/**
 	 * Draft status
 	 */
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -51,26 +51,15 @@ class Commande extends CommonOrder
     */
    protected $table_ref_field = 'ref';

-    var $id;
-
 	/**
 	 * Client ID
 	 * @var int
 	 */
    var $socid;

-	/**
-	 * Client (loaded by fetch_client)
-	 * @var Societe
-	 */
-    var $client;
-
-    var $ref;
    var $ref_client;
-    var $ref_ext;
    var $ref_int;
    var $contactid;
-    var $fk_project;

 	/**
 	 * Status of the order. Check the following constants:
@@ -86,16 +75,12 @@ class Commande extends CommonOrder
    var $billed;		// billed or not

    var $brouillon;
-    var $cond_reglement_id;
    var $cond_reglement_code;
-    var $fk_account;
-    var $mode_reglement_id;
    var $mode_reglement_code;
    var $availability_id;
    var $availability_code;
    var $demand_reason_id;
    var $demand_reason_code;
-    var $fk_delivery_address;
    var $address;
    var $date;				// Date commande
 	/**
@@ -104,31 +89,15 @@ class Commande extends CommonOrder
 	 */
    var $date_commande;
    var $date_livraison;	// Date livraison souhaitee
-    var $shipping_method_id;
    var $fk_remise_except;
    var $remise_percent;
-    var $total_ht;			// Total net of tax
-    var $total_ttc;			// Total with tax
-    var $total_tva;			// Total VAT
-    var $total_localtax1;   // Total Local tax 1
-    var $total_localtax2;   // Total Local tax 2
    var $remise_absolue;
-    var $modelpdf;
    var $info_bits;
    var $rang;
    var $special_code;
    var $source;			// Origin of order
-	/**
-	 * @deprecated
-	 * @see note_private, note_public
-	 */
-    var $note;
-    var $note_private;
-    var $note_public;
    var $extraparams=array();

-    var $origin;
-    var $origin_id;
    var $linked_objects=array();

    var $user_author_id;
@@ -138,11 +107,6 @@ class Commande extends CommonOrder
 	 */
 	var $lines = array();

-	//Incorterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
-
    // Pour board
    var $nbtodo;
    var $nbtodolate;
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -44,9 +44,7 @@ class Account extends CommonObject
     * @see id
     */
    var $rowid;
-    var $id;

-    var $ref;
    var $label;
    //! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne
    var $courant;
@@ -75,10 +73,6 @@ class Account extends CommonObject
    var $state_code;
    var $state;

-    var $country_id;
-    var $country_code;
-    var $country;
-
    var $type_lib=array();

    var $account_number;
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -37,23 +37,13 @@ class Deplacement extends CommonObject
 	public $fk_element = '';
 	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-	var $id;
-
 	var $datec;         // Creation date
 	var $dated;
 	var $fk_user_author;
 	var $fk_user;
 	var $km;
-	/**
-	 * @deprecated
-	 * @see note_private, note_public
-	 */
-	var $note;			// TODO deprecated
-	var $note_private;
-	var $note_public;
 	var $socid;
 	var $statut;		// 0=draft, 1=validated
-	var $fk_project;
 	var $extraparams=array();

 	var $statuts=array();
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -42,35 +42,20 @@ class FactureRec extends Facture
 	public $table_element_line='facturedet_rec';
 	public $fk_element='fk_facture';

-	var $id;
-
-	//! Id customer
-	var $socid;
-	//! Customer object (charging by fetch_client)
-	var $client;
-
 	var $number;
-	var $author;
 	var $date;
-	var $ref;
 	var $amount;
 	var $remise;
 	var $tva;
 	var $total;
-	var $note_private;
-	var $note_public;
 	var $db_table;
 	var $propalid;
-	var $fk_project;

 	var $rang;
 	var $special_code;

 	var $usenewprice=0;

-	var $lines=array();
-
-
 	/**
 	 *	Constructor
 	 *
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -58,27 +58,15 @@ class Facture extends CommonInvoice
 	 */
 	protected $table_ref_field = 'facnumber';

-	var $id;
-	//! Id client
 	var $socid;
-	//! Objet societe client (to load with fetch_client method)

-	/**
-	 * Customer
-	 * @var Societe
-	 */
-	var $client;
 	var $author;
 	var $fk_user_author;
 	var $fk_user_valid;
-	//! Invoice date
-	var $date;				// Invoice date
 	var $date_creation;		// Creation date
 	var $date_validation;	// Validation date
 	var $datem;
-	var $ref;
 	var $ref_client;
-	var $ref_ext;
 	var $ref_int;
 	//Check constants for types
 	var $type = self::TYPE_STANDARD;
@@ -90,20 +78,7 @@ class Facture extends CommonInvoice
 	var $total_tva=0;
 	var $total_ttc=0;
 	var $revenuestamp;
-	/**
-	 * @deprecated
-	 * @see note_private, note_public
-	 */
-	var $note;
-	var $note_private;
-	var $note_public;

-	/**
-	 * Invoice status
-	 * @var int
-	 * @see Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_PAID, Facture::STATUS_ABANDONED
-	 */
-	var $statut;
 	//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
 	//! Fermeture alors que aucun paiement: replaced (si remplace), abandon
 	var $close_code;
@@ -113,18 +88,11 @@ class Facture extends CommonInvoice
 	var $paye;
 	//! id of source invoice if replacement invoice or credit note
 	var $fk_facture_source;
-	var $origin;
-	var $origin_id;
 	var $linked_objects=array();
-	var $fk_project;
 	var $date_lim_reglement;
-	var $cond_reglement_id;			// Id in llx_c_paiement
 	var $cond_reglement_code;		// Code in llx_c_paiement
-	var $mode_reglement_id;			// Id in llx_c_paiement
 	var $mode_reglement_code;		// Code in llx_c_paiement
-    var $fk_account;                // Id of bank account
 	var $fk_bank;					// Field to store bank id to use when payment mode is withdraw
-	var $modelpdf;
 	/**
 	 * @deprecated
 	 */
@@ -139,11 +107,6 @@ class Facture extends CommonInvoice

 	var $fac_rec;

-	//Incoterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
-
 	/**
 	 * @var int Situation cycle reference number
 	 */
@@ -159,64 +122,6 @@ class Facture extends CommonInvoice
 	 */
 	public $situation_final;

-    /**
-     * Standard invoice
-     */
-    const TYPE_STANDARD = 0;
-
-    /**
-     * Replacement invoice
-     */
-    const TYPE_REPLACEMENT = 1;
-
-    /**
-     * Credit note invoice
-     */
-    const TYPE_CREDIT_NOTE = 2;
-
-    /**
-     * Deposit invoice
-     */
-    const TYPE_DEPOSIT = 3;
-
-    /**
-     * Proforma invoice
-     */
-    const TYPE_PROFORMA = 4;
-
-	/**
-	 * Situation invoice
-	 */
-	const TYPE_SITUATION = 5;
-
-	/**
-	 * Draft
-	 */
-	const STATUS_DRAFT = 0;
-
-	/**
-	 * Validated (need to be paid)
-	 */
-	const STATUS_VALIDATED = 1;
-
-	/**
-	 * Classified paid.
-	 * If paid partially, $this->close_code can be:
-	 * - CLOSECODE_DISCOUNTVAT
-	 * - CLOSECODE_BADDEBT
-	 * If paid completelly, this->close_code will be null
-	 */
-	const STATUS_CLOSED = 2;
-
-	/**
-	 * Classified abandoned and no payment done.
-	 * $this->close_code can be:
-	 * - CLOSECODE_BADDEBT
-	 * - CLOSECODE_ABANDONED
-	 * - CLOSECODE_REPLACED
-	 */
-	const STATUS_ABANDONED = 3;
-
 	const CLOSECODE_DISCOUNTVAT = 'discount_vat';
 	const CLOSECODE_BADDEBT = 'badcustomer';
 	const CLOSECODE_ABANDONED = 'abandon';
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -29,15 +29,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 */
 class Localtax extends CommonObject
 {
-    var $id;
-    var $ref;
    var $ltt;
 	var $tms;
 	var $datep;
 	var $datev;
 	var $amount;
 	var $label;
-	var $note;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -36,14 +36,11 @@ class RemiseCheque extends CommonObject
 	public $element='chequereceipt';
 	public $table_element='bordereau_cheque';

-	var $id;
 	var $num;
 	var $intitule;
-	var $ref_ext;
 	//! Numero d'erreur Plage 1024-1279
 	var $errno;

-	public $statut;
 	public $amount;
 	public $date_bordereau;
 	public $account_id;
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -36,8 +36,6 @@ class Paiement extends CommonObject
    public $element='payment';
    public $table_element='paiement';

-    var $id;
-	var $ref;
 	var $facid;
 	var $datepaye;
 	/**
@@ -59,8 +57,6 @@ class Paiement extends CommonObject
 	var $num_paiement;	// Numero du CHQ, VIR, etc...
 	var $bank_account;	// Id compte bancaire du paiement
 	var $bank_line;     // Id de la ligne d'ecriture bancaire
-	var $fk_account;	// Id of bank account
-	var $note;
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement

--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -37,8 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 */
 class BonPrelevement extends CommonObject
 {
-    var $db;
-
    var $date_echeance;
    var $raison_sociale;
    var $reference_remise;
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -34,9 +34,6 @@ class PaymentSalary extends CommonObject
 	//public $element='payment_salary';			//!< Id that identify managed objects
 	//public $table_element='payment_salary';	//!< Name of table without prefix where object is stored

-	var $id;
-	var $ref;
-
 	var $tms;
 	var $fk_user;
 	var $datep;
@@ -47,7 +44,6 @@ class PaymentSalary extends CommonObject
 	var $label;
 	var $datesp;
 	var $dateep;
-	var $note;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -39,8 +39,6 @@ class ChargeSociales extends CommonObject
     */
    protected $table_ref_field = 'ref';

-    var $id;
-    var $ref;
    var $date_ech;
    var $lib;
    var $type;
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -33,9 +33,6 @@ class PaymentSocialContribution extends CommonObject
 	public $element='paiementcharge';			//!< Id that identify managed objects
 	public $table_element='paiementcharge';	//!< Name of table without prefix where object is stored

-	var $id;
-	var $ref;
-
 	var $fk_charge;
 	var $datec='';
 	var $tms='';
@@ -49,7 +46,6 @@ class PaymentSocialContribution extends CommonObject
    var $amounts=array();   // Array of amounts
 	var $fk_typepaiement;
 	var $num_paiement;
-	var $note;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -35,9 +35,6 @@ class Tva extends CommonObject
 	//public $element='tva';			//!< Id that identify managed objects
 	//public $table_element='tva';	//!< Name of table without prefix where object is stored

-    var $id;
-    var $ref;
-
 	var $tms;
 	var $datep;
 	var $datev;
@@ -45,7 +42,6 @@ class Tva extends CommonObject
 	var $type_payment;
 	var $num_payment;
 	var $label;
-	var $note;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -29,12 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class
 */
 class ActionsContactCardDefault extends ActionsContactCardCommon
 {
-	var $db;
-	var $dirmodule;
-    var $targetmodule;
-    var $canvas;
-    var $card;
-
 	/**
     *	Constructor
     *
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -41,11 +41,7 @@ class Contact extends CommonObject
 	public $table_element='socpeople';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-	var $id;
-    var $ref_ext;
 	var $civility_id;  // In fact we store civility_code
-    var $lastname;
-	var $firstname;
 	var $address;
 	var $zip;
 	var $town;
@@ -69,10 +65,6 @@ class Contact extends CommonObject
 	var $state_code;		    // Code of department
 	var $state;			        // Label of department

-	var $country_id;			// Id of country
-	var $country_code;			// Code of country
-	var $country;				// Label of country
-
    var $poste;                 // Position

 	var $socid;					// fk_soc
@@ -91,13 +83,6 @@ class Contact extends CommonObject

 	var $birthday;
 	var $default_lang;
-    var $note_public;           // Public note
-	/**
-	 * @deprecated
-	 * @see note_public, note_private
-	 */
-	var $note;
-	var $note_private;			// Private note
    var $no_email;				// 1=Don't send e-mail to this contact, 0=do

 	var $ref_facturation;       // Nb de reference facture pour lequel il est contact
@@ -107,7 +92,6 @@ class Contact extends CommonObject

 	var $user_id;
 	var $user_login;
-	var $import_key;

 	var $oldcopy;				// To contains a clone of this when we need to save old properties of object

--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -50,25 +50,6 @@ class Contrat extends CommonObject
 	 */
 	protected $table_ref_field = 'ref';

-	/**
-	 * Id of the contract
-	 * @var int
-	 */
-	var $id;
-
-	/**
-	 * Reference of the contract
-	 * @var string
-	 */
-	var $ref;
-
-	/**
-	 * External reference of the contract.
-	 * Used by 3rd party services
-	 * @var string
-	 */
-	var $ref_ext;
-
 	/**
 	 * Supplier reference of the contract
 	 * @var string
@@ -140,26 +121,12 @@ class Contrat extends CommonObject
 	var $commercial_signature_id;
 	var $commercial_suivi_id;

-	/**
-	 * @var string	Private note
-	 */
-	var $note_private;
-
-	/**
-	 * @var string	Public note
-	 */
-	var $note_public;
-
-	var $modelpdf;
-
 	/**
 	 * @deprecated Use fk_project instead
 	 * @see fk_project
 	 */
 	var $fk_projet;

-	public $fk_project;
-
 	var $extraparams=array();

 	/**
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -131,6 +131,7 @@ abstract class CommonObject
 	public $thirdparty;
 	/**
 	 * @deprecated
+	 * @var Societe A related customer
 	 * @see thirdparty
 	 */
 	public $client;
@@ -283,27 +284,27 @@ abstract class CommonObject
 	public $note;

 	/**
-	 * @var float
+	 * @var float Total amount before taxes
 	 * @see update_price()
 	 */
 	public $total_ht;
 	/**
-	 * @var float
+	 * @var float Total VAT amount
 	 * @see update_price()
 	 */
 	public $total_tva;
 	/**
-	 * @var float
+	 * @var float Total local tax 1 amount
 	 * @see update_price()
 	 */
 	public $total_localtax1;
 	/**
-	 * @var float
+	 * @var float Total local tax 2 amount
 	 * @see update_price()
 	 */
 	public $total_localtax2;
 	/**
-	 * @var float
+	 * @var float Total amount with taxes
 	 * @see update_price()
 	 */
 	public $total_ttc;
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -43,9 +43,6 @@ abstract class CommonObjectLine extends CommonObject
 	 */
 	public $rowid;

-    //! Database handler
-    public $db;
-
 	/**
 	 * Product/service unit code ('km', 'm', 'p', ...)
 	 * @var string
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -137,36 +137,6 @@ abstract class CommonOrderLine extends CommonObjectLine
 	public $localtax1_type;
 	public $localtax2_type;

-	/**
-	 * Total amount before taxes
-	 * @var float
-	 */
-	public $total_ht;
-
-	/**
-	 * Total VAT amount
-	 * @var float
-	 */
-	public $total_tva;
-
-	/**
-	 * Total local tax 1 amount
-	 * @var float
-	 */
-	public $total_localtax1;
-
-	/**
-	 * Total local tax 2 amount
-	 * @var float
-	 */
-	public $total_localtax2;
-
-	/**
-	 * Total amount with taxes
-	 * @var float
-	 */
-	public $total_ttc;
-
 	/**
 	 * Liste d'options cumulables:
 	 * Bit 0:	0 si TVA normal - 1 si TVA NPR
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -34,7 +34,6 @@ class Fiscalyear extends CommonObject
 	public $fk_element = '';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-	var $id;
 	var $rowid;

 	var $label;
@@ -324,4 +323,4 @@ class Fiscalyear extends CommonObject
 		}
 	}

-}
+}
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
@@ -30,8 +30,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';

 class GenericObject extends CommonObject
 {
-	var $db;
-
 	/**
 	 *	Constructor
 	 *
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -31,7 +31,6 @@ class Link extends CommonObject
    public $element = 'link';
    public $table_element = 'links';

-    public $id;
    public $entity;
    public $datea;
    public $url;
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.
 */
 class BordereauChequeBlochet extends ModeleChequeReceipts
 {
-    var $error='';
-
 	var $emetteur;	// Objet societe qui emet

 	/**
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -30,15 +30,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 */
 class Cronjob extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
 	var $element='cronjob';			//!< Id that identify managed objects
 	var $table_element='cronjob';		//!< Name of table without prefix where object is stored

-    var $id;
-
-    var $ref; //Use for prevnext_ref
    var $jobtype;
 	var $tms='';
 	var $datec='';
@@ -63,12 +57,8 @@ class Cronjob extends CommonObject
 	var $status;
 	var $fk_user_author;
 	var $fk_user_mod;
-	var $note;
 	var $nbrun;
 	var $libname;
-	var $lines;
-
-


    /**
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -39,29 +39,17 @@ class Don extends CommonObject
 	public $fk_element = 'fk_donation';
 	protected $ismultientitymanaged = 1;  	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-    var $id;
-    var $ref;
    var $date;
    var $amount;
-    var $firstname;
-    var $lastname;
    var $societe;
    var $address;
    var $zip;
    var $town;
-    var $country_id;
-    var $country_code;
-    var $country;
    var $email;
    var $public;
    var $fk_projet;
    var $fk_typepayment;
 	var $num_payment;
-    var $note_private;
-    var $note_public;
-    var $statut;
-	var $modelpdf;
-    var $projet;

 	/**
 	 * @deprecated
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -32,9 +32,7 @@ class PaymentDonation extends CommonObject
 	public $element='payment_donation';			//!< Id that identify managed objects
 	public $table_element='payment_donation';	//!< Name of table without prefix where object is stored

-	var $id;
 	var $rowid;
-	var $ref;

 	var $fk_donation;
 	var $datec='';
@@ -44,7 +42,6 @@ class PaymentDonation extends CommonObject
    var $amounts=array();   // Array of amounts
 	var $typepayment;
 	var $num_payment;
-	var $note;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -45,24 +45,15 @@ class Expedition extends CommonObject
 	public $table_element="expedition";
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-	var $id;
 	var $socid;
 	var $ref_customer;
-	var $ref_ext;
 	var $ref_int;
 	var $brouillon;
 	var $entrepot_id;
-	var $modelpdf;
-	var $origin;
-	var $origin_id;
 	var $lines=array();
-	var $shipping_method_id;
 	var $tracking_number;
 	var $tracking_url;
-	var $statut;
 	var $billed;
-	var $note_public;
-	var $note_private;
 	var $model_pdf;

 	var $trueWeight;
@@ -95,20 +86,8 @@ class Expedition extends CommonObject
 	var $date_creation;
 	var $date_valid;

-	// For Invoicing
-	var $total_ht;			// Total net of tax
-	var $total_ttc;			// Total with tax
-	var $total_tva;			// Total VAT
-	var $total_localtax1;   // Total Local tax 1
-	var $total_localtax2;   // Total Local tax 2
-
 	var $listmeths;			// List of carriers

-	//Incorterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
-
 	/**
 	 *	Constructor
 	 *
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -31,7 +31,6 @@ class ExpeditionLineBatch extends CommonObject
 	var $element='expeditionlignebatch';			//!< Id that identify managed objects
 	private static $_table_element='expeditiondet_batch';		//!< Name of table without prefix where object is stored

-	var $id;
 	var $sellby;
 	var $eatby;
 	var $batch;
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -29,21 +29,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 */
 class ExpenseReport extends CommonObject
 {
-    var $db;
-    var $error;
    var $element='expensereport';
    var $table_element='expensereport';
    var $table_element_line = 'expensereport_det';
    var $fk_element = 'fk_expensereport';

-    var $id;
-    var $ref;
    var $lignes=array();
-    var $total_ht;
-    var $total_tva;
-    var $total_ttc;
-    var $note_public;
-    var $note_private;
    var $date_debut;
    var $date_fin;

--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -32,9 +32,7 @@ class PaymentExpenseReport extends CommonObject
 	public $element='payment_expensereport';			//!< Id that identify managed objects
 	public $table_element='payment_expensereport';	//!< Name of table without prefix where object is stored

-	var $id;
 	var $rowid;
-	var $ref;

 	var $fk_expensereport;
 	var $datec='';
@@ -44,7 +42,6 @@ class PaymentExpenseReport extends CommonObject
    var $amounts=array();   // Array of amounts
 	var $fk_typepayment;
 	var $num_payment;
-	var $note;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -43,24 +43,16 @@ class Fichinter extends CommonObject
 	 */
 	protected $table_ref_field = 'ref';

-	var $id;
-
 	var $socid;		// Id client
-	var $client;		// Objet societe client (a charger par fetch_client)

 	var $author;
-	var $ref;
 	var $datec;
 	var $datev;
 	var $datem;
 	var $duration;
 	var $statut;		// 0=draft, 1=validated, 2=invoiced
 	var $description;
-	var $note_private;
-	var $note_public;
-	var $fk_project;
 	var $fk_contrat;
-	var $modelpdf;
 	var $extraparams=array();

 	var $lines = array();
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 */
 class Fournisseur extends Societe
 {
-	var $db;
-
 	var $next_prev_filter="te.fournisseur = 1";		// Used to add a filter in Form::showrefnav method
 	
 	
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -36,21 +36,6 @@ class PaiementFourn extends Paiement
    public $element='payment_supplier';
    public $table_element='paiementfourn';

-    var $id;
-	var $ref;
-	var $facid;
-	var $datepaye;
-	var $total;
-    var $amount;            // Total amount of payment
-    var $amounts=array();   // Array of amounts
-	var $author;
-	var $paiementid;	// Type de paiement. Stocke dans fk_paiement
-						// de llx_paiement qui est lie aux types de
-						//paiement de llx_c_paiement
-	var $num_paiement;	// Numero du CHQ, VIR, etc...
-	var $bank_account;	// Id compte bancaire du paiement
-	var $bank_line;		// Id de la ligne d'ecriture bancaire
-	var $note;
    var $statut;        //Status of payment. 0 = unvalidated; 1 = validated
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -34,16 +34,11 @@ class Holiday extends CommonObject
 	public $element='holiday';
 	public $table_element='holiday';

-	var $db;
-    var $error;
-    var $errors=array();
-
 	/**
 	 * @deprecated
 	 * @see id
 	 */
    var $rowid;
-    var $ref;

    var $fk_user;
    var $date_create='';
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -43,32 +43,15 @@ class Livraison extends CommonObject
 	public $fk_element="fk_livraison";
 	public $table_element="livraison";

-	var $id;
 	var $brouillon;
-	var $origin;
-	var $origin_id;
 	var $socid;
 	var $ref_customer;
-	var $statut;
-
-	/**
-	 * @deprecated
-	 * @see note_public, note_private
-	 */
-	var $note;
-	var $note_public;
-	var $note_private;

 	var $date_delivery;    // Date really received
 	var $date_creation;
 	var $date_valid;
 	var $model_pdf;

-	//Incorterms
-	var $fk_incoterms;
-	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
-
 	/**
 	 * Constructor
 	 *
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -33,17 +33,13 @@ class Loan extends CommonObject
    public $table='loan';
    public $table_element='loan';

-    var $id;
 	var $rowid;
-    var $ref;
    var $datestart;
 	var $dateend;
    var $label;
    var $capital;
 	var $nbterm;
 	var $rate;
-    var $note_private;
-    var $note_public;
 	var $paid;
 	var $account_capital;
 	var $account_insurance;
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -33,9 +33,6 @@ class PaymentLoan extends CommonObject
 	public $element='payment_loan';			//!< Id that identify managed objects
 	public $table_element='payment_loan';	//!< Name of table without prefix where object is stored

-	var $id;
-	var $ref;
-
 	var $fk_loan;
 	var $datec='';
 	var $tms='';
@@ -46,8 +43,6 @@ class PaymentLoan extends CommonObject
 	var $amount_interest;
 	var $fk_typepayment;
 	var $num_payment;
-	var $note_private;
-	var $note_public;
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -34,14 +34,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 */
 class Opensurveysondage extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
 	var $element='opensurvey_sondage';			//!< Id that identify managed objects
 	var $table_element='opensurvey_sondage';	//!< Name of table without prefix where object is stored

-    var $id;
-
 	var $id_sondage;
 	/**
 	 * @deprecated
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -55,10 +55,6 @@ class Product extends CommonObject

 	var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';

-	//! Identifiant unique
-	var $id ;
-	//! Ref
-	var $ref;
 	/*
 	 * @deprecated
 	 * @see label
@@ -128,8 +124,6 @@ class Product extends CommonObject
 	var $status_batch;

 	var $customcode;       // Customs code
-    var $country_id;       // Country origin id
-	var $country_code;     // Country origin code (US, FR, ...)

 	//! Unites de mesure
 	var $weight;
@@ -146,10 +140,6 @@ class Product extends CommonObject

 	//! barcode
 	var $barcode;               // value
-	var $barcode_type;          // id
-	var $barcode_type_code;     // code  (loaded by fetch_barcode). Example 'ean', 'isbn', ...
-	var $barcode_type_label;    // label (loaded by fetch_barcode)
-	var $barcode_type_coder;    // coder (loaded by fetch_barcode). Engine.

 	var $stats_propale=array();
 	var $stats_commande=array();
@@ -163,10 +153,6 @@ class Product extends CommonObject
 	var $imgWidth;
 	var $imgHeight;

-	//! Canevas a utiliser si le produit n'est pas un produit generique
-	var $canvas;
-
-	var $import_key;
 	var $date_creation;
 	var $date_modification;

@@ -183,9 +169,6 @@ class Product extends CommonObject

 	var $oldcopy;

-	//note not visible on orders and invoices
-	var $note;
-
    var $fk_price_expression;

 	/**
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -33,15 +33,12 @@ class Productbatch extends CommonObject
 	var $element='productbatch';			//!< Id that identify managed objects
 	private static $_table_element='product_batch';		//!< Name of table without prefix where object is stored

-    var $id;
-
 	var $tms='';
 	var $fk_product_stock;
 	var $sellby='';
 	var $eatby='';
 	var $batch='';
 	var $qty;
-	var $import_key;
 	public $warehouseid;


--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -28,12 +28,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 */
 class Productcustomerprice extends CommonObject
 {
-	var $db; // !< To store db handler
-	var $error; // !< To return error code (or message)
-	var $errors = array (); // !< To return several error codes (or messages)
 	var $element = 'product_customer_price'; // !< Id that identify managed objects
 	var $table_element = 'product_customer_price'; // !< Name of table without prefix where object is stored
-	var $id;
 	var $entity;
 	var $datec = '';
 	var $tms = '';
@@ -49,7 +45,6 @@ class Productcustomerprice extends CommonObject
 	var $localtax1_tx;
 	var $localtax2_tx;
 	var $fk_user;
-	var $import_key;
 	var $lines = array ();

 	/**
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -31,13 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 */
 class Propalmergepdfproduct extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
 	var $element='propal_merge_pdf_product';			//!< Id that identify managed objects
 	var $table_element='propal_merge_pdf_product';		//!< Name of table without prefix where object is stored
-
-    var $id;
    
 	var $fk_product;
 	var $file_name;
@@ -45,7 +40,6 @@ class Propalmergepdfproduct extends CommonObject
 	var $fk_user_mod;
 	var $datec='';
 	var $tms='';
-	var $import_key;
 	var $lang;
 	
 	var $lines=array();
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -29,9 +29,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 */
 class Service extends CommonObject
 {
-	var $db;
-
-	var $id;
 	var $libelle;
 	var $price;
 	var $tms;
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -35,7 +35,6 @@ class Entrepot extends CommonObject
 	public $element='stock';
 	public $table_element='entrepot';

-	var $id;
 	var $libelle;
 	var $description;
 	//! Statut 1 pour ouvert, 0 pour ferme
@@ -46,10 +45,6 @@ class Entrepot extends CommonObject
 	var $zip;
 	var $town;

-	var $country;
-	var $country_id;
-	var $country_code;
-

 	/**
 	 *  Constructor
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -30,9 +30,6 @@
 */
 class MouvementStock extends CommonObject
 {
-    var $error;
-    var $db;
-
 	var $product_id;
 	var $entrepot_id;
 	var $qty;
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -43,8 +43,6 @@ class Project extends CommonObject
     */
    protected $table_ref_field = 'ref';

-    var $id;
-    var $ref;
    var $description;
 	/**
 	 * @var string
@@ -60,8 +58,6 @@ class Project extends CommonObject
    var $user_author_id;    //!< Id of project creator. Not defined if shared project.
 	var $user_close_id;
    var $public;      //!< Tell if this is a public or private project
-    var $note_private;
-    var $note_public;
    var $budget_amount;

    var $statuts_short;
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -24,7 +24,6 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 */
 class ProjectStats extends Stats
 {
-	protected $db;
 	private $project;
 	public $userid;
 	public $socid;
@@ -460,4 +459,4 @@ class ProjectStats extends Stats
 		// var_dump($res);print '<br>';
 		return $res;
 	}
-}
+}
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -34,11 +34,6 @@ class Task extends CommonObject
    public $element='project_task';		//!< Id that identify managed objects
    public $table_element='projet_task';	//!< Name of table without prefix where object is stored

-    var $id;
-
-	var $ref;
-
-    var $fk_project;
    var $fk_task_parent;
    var $label;
    var $description;
@@ -51,9 +46,6 @@ class Task extends CommonObject
    var $priority;
    var $fk_user_creat;
    var $fk_user_valid;
-    var $statut;
-    var $note_private;
-    var $note_public;
 	var $rang;

    var $timespent_id;
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -31,15 +31,9 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
 */
 class Resource extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
 	var $element='resource';			//!< Id that identify managed objects
 	var $table_element='resource';	//!< Name of table without prefix where object is stored

-    var $id;
-
-
 	var $resource_id;
 	var $resource_type;
 	var $element_id;
@@ -50,7 +44,6 @@ class Resource extends CommonObject
 	var $type_label;
 	var $tms='';

-
    /**
     *  Constructor
     *
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -29,11 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
 */
 class ActionsCardCompany extends ActionsCardCommon
 {
-    var $dirmodule;
-	var $targetmodule;
-    var $canvas;
-    var $card;
-
 	/**
 	 *    Constructor
 	 *
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -28,11 +28,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
 */
 class ActionsCardIndividual extends ActionsCardCommon
 {
-    var $dirmodule;
-	var $targetmodule;
-    var $canvas;
-    var $card;
-
    /**
 	 *    Constructor
 	 *
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -29,8 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 */
 class Client extends Societe
 {
-    var $db;
-
    var $next_prev_filter="te.client in (1,2,3)";	// Used to add a filter in Form::showrefnav method

    var $cacheprospectstatus=array();
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -32,21 +32,8 @@ require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
 */
 class CompanyBankAccount extends Account
 {
-    var $rowid;
    var $socid;

-    var $label;
-    var $bank;
-    var $courant;
-    var $clos;
-    var $code_banque;
-    var $code_guichet;
-    var $number;
-    var $cle_rib;
-    var $bic;
-    var $iban;
-    var $proprio;
-    var $owner_address;
    var $default_rib;
    var $frstrecur;

--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -51,8 +51,6 @@ class Societe extends CommonObject
     */
    protected $ismultientitymanaged = 1;

-    public $id;
-    public $name;
    public $entity;

    /**
@@ -63,9 +61,6 @@ class Societe extends CommonObject
     */
    public $nom;

-    var $firstname;
-    var $lastname;
-
 	/**
 	 * Alias names (commercial, trademark or alias names)
 	 * @var string
@@ -73,7 +68,6 @@ class Societe extends CommonObject
 	public $name_alias;

    public $particulier;
-    public $civility_id;
    public $address;
    public $zip;
    public $town;
@@ -113,9 +107,6 @@ class Societe extends CommonObject
     * @see country
     */
    var $pays;
-    var $country_id;
-    var $country_code;
-    var $country;

 	/**
 	 * Phone number
@@ -149,26 +140,6 @@ class Societe extends CommonObject
     * @var string
     */
    var $barcode;
-    /**
-     * ID of bardode type
-     * @var int
-     */
-    var $barcode_type;
-    /**
-     * code (loaded by fetch_barcode)
-     * @var string
-     */
-    var $barcode_type_code;
-    /**
-     * label (loaded by fetch_barcode)
-     * @var string
-     */
-    var $barcode_type_label;
-    /**
-     * coder (loaded by fetch_barcode)
-     * @var string
-     */
-    var $barcode_type_coder;

    // 6 professional id (usage depends on country)

@@ -233,8 +204,6 @@ class Societe extends CommonObject
    var $forme_juridique;

    var $remise_percent;
-    var $mode_reglement_id;
-    var $cond_reglement_id;
    var $mode_reglement_supplier_id;
    var $cond_reglement_supplier_id;
 	var $fk_prospectlevel;
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -44,14 +44,9 @@ class User extends CommonObject
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

 	var $id=0;
-	var $ref;
-	var $ref_ext;
 	var $ldap_sid;
 	var $search_sid;
-	var $lastname;
-	var $firstname;
 	var $gender;
-	var $note;
 	var $email;
 	var $skype;
 	var $job;
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -38,16 +38,13 @@ class UserGroup extends CommonObject
 	public $table_element='usergroup';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-	var $id;			// Group id
 	var $entity;		// Entity of group
 	/**
 	 * @deprecated
 	 * @see name
 	 */
 	var $nom;			// Name of group
-	var $name;			// Name of group
 	var $globalgroup;	// Global group
-	var $note;			// Note on group
 	var $datec;			// Creation date of group
 	var $datem;			// Modification date of group
 	var $members=array();	// Array of users