瀏覽代碼

Update and standardize code

Philippe GRAND 6 年之前
父節點
當前提交
0ffad50974
共有 33 個文件被更改,包括 157 次插入35 次删除
  1. 6 3
      htdocs/accountancy/class/accountingaccount.class.php
  2. 5 1
      htdocs/bookmarks/class/bookmark.class.php
  3. 3 1
      htdocs/comm/action/class/actioncomm.class.php
  4. 4 1
      htdocs/comm/action/class/cactioncomm.class.php
  5. 4 1
      htdocs/comm/mailing/class/advtargetemailing.class.php
  6. 5 1
      htdocs/compta/bank/class/account.class.php
  7. 5 1
      htdocs/compta/bank/class/paymentvarious.class.php
  8. 4 1
      htdocs/compta/facture/class/paymentterm.class.php
  9. 4 1
      htdocs/compta/prelevement/class/ligneprelevement.class.php
  10. 4 1
      htdocs/compta/prelevement/class/rejetprelevement.class.php
  11. 5 1
      htdocs/contrat/class/contrat.class.php
  12. 5 1
      htdocs/core/class/ccountry.class.php
  13. 5 1
      htdocs/core/class/cstate.class.php
  14. 5 1
      htdocs/core/class/ctypent.class.php
  15. 4 1
      htdocs/core/class/events.class.php
  16. 4 1
      htdocs/core/class/notify.class.php
  17. 5 1
      htdocs/core/modules/export/export_csv.modules.php
  18. 5 1
      htdocs/core/modules/export/export_excel.modules.php
  19. 5 1
      htdocs/core/modules/export/export_excel2007.modules.php
  20. 5 1
      htdocs/core/modules/export/export_tsv.modules.php
  21. 5 1
      htdocs/core/modules/import/import_csv.modules.php
  22. 5 1
      htdocs/core/modules/import/import_xlsx.modules.php
  23. 5 1
      htdocs/core/modules/security/generate/modGeneratePassNone.class.php
  24. 5 1
      htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
  25. 5 1
      htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
  26. 4 1
      htdocs/ecm/class/ecmdirectory.class.php
  27. 5 1
      htdocs/fourn/class/fournisseur.product.class.php
  28. 5 1
      htdocs/product/class/productcustomerprice.class.php
  29. 4 1
      htdocs/product/class/propalmergepdfproduct.class.php
  30. 5 1
      htdocs/product/dynamic_price/class/price_expression.class.php
  31. 5 1
      htdocs/product/dynamic_price/class/price_global_variable.class.php
  32. 6 1
      htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
  33. 6 1
      htdocs/supplier_proposal/class/supplier_proposal.class.php

+ 6 - 3
htdocs/accountancy/class/accountingaccount.class.php

@@ -53,15 +53,18 @@ class AccountingAccount extends CommonObject
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
-	
+	public $error='';	
 
 	/**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
 	
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $rowid;
 	var $datec; // Creation date
 	var $fk_pcg_version;

+ 5 - 1
htdocs/bookmarks/class/bookmark.class.php

@@ -38,7 +38,11 @@ class Bookmark extends CommonObject
      */
     public $db;
 
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
     var $fk_user;
     var $datec;
     var $url;

+ 3 - 1
htdocs/comm/action/class/actioncomm.class.php

@@ -38,11 +38,13 @@ class ActionComm extends CommonObject
     public $table_element = 'actioncomm';
     public $table_rowid = 'id';
     public $picto='action';
+    
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
      * @var int
      */
     public $ismultientitymanaged = 1;
+    
     /**
      * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user, 2=Same than 1 but accept record if fksoc is empty
      * @var integer
@@ -53,7 +55,7 @@ class ActionComm extends CommonObject
      * Id of the event
      * @var int
      */
-    var $id;
+	public $id;
 
     /**
      * Id of the event. Use $id as possible

+ 4 - 1
htdocs/comm/action/class/cactioncomm.class.php

@@ -38,7 +38,10 @@ class CActionComm
      */
     public $db;
 
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
 
     var $code;
     var $type;

+ 4 - 1
htdocs/comm/mailing/class/advtargetemailing.class.php

@@ -46,7 +46,10 @@ class AdvanceTargetingMailing extends CommonObject
 	var $element='advtargetemailing';			//!< Id that identify managed objects
 	var $table_element='advtargetemailing';	//!< Name of table without prefix where object is stored
 
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
 	var $name;
 	var $entity;

+ 5 - 1
htdocs/compta/bank/class/account.class.php

@@ -1647,7 +1647,11 @@ class AccountLine extends CommonObject
 	var $table_element='bank';
 	var $picto = 'generic';
 
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $ref;
 	var $datec;
 	var $dateo;

+ 5 - 1
htdocs/compta/bank/class/paymentvarious.class.php

@@ -34,7 +34,11 @@ class PaymentVarious extends CommonObject
 	public $table_element='payment_various';	//!< Name of table without prefix where object is stored
 	public $picto = 'bill';
 
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $ref;
 	var $tms;
 	var $datep;

+ 4 - 1
htdocs/compta/facture/class/paymentterm.class.php

@@ -47,7 +47,10 @@ class PaymentTerm // extends CommonObject
 	//public  $table_element='c_payment_term';	//!< Name of table without prefix where object is stored
 	var $context =array();
 
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
 
 	var $code;
 	var $sortorder;

+ 4 - 1
htdocs/compta/prelevement/class/ligneprelevement.class.php

@@ -31,7 +31,10 @@
  */
 class LignePrelevement
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 	
 	/**
      * @var DoliDB Database handler.

+ 4 - 1
htdocs/compta/prelevement/class/rejetprelevement.class.php

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

+ 5 - 1
htdocs/contrat/class/contrat.class.php

@@ -2454,7 +2454,11 @@ class ContratLigne extends CommonObjectLine
     public $element='contratdet';
     public $table_element='contratdet';
 
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $ref;
 	var $tms;
 

+ 5 - 1
htdocs/core/class/ccountry.class.php

@@ -50,7 +50,11 @@ class Ccountry // extends CommonObject
 	//var $element='ccountry';			//!< Id that identify managed objects
 	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
 
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $code;
 	var $code_iso;
 	var $label;

+ 5 - 1
htdocs/core/class/cstate.class.php

@@ -50,7 +50,11 @@ class Cstate // extends CommonObject
 	//var $element='cstate';			//!< Id that identify managed objects
 	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
 
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $code_departement;
 	var $nom;
 	var $active;

+ 5 - 1
htdocs/core/class/ctypent.class.php

@@ -45,7 +45,11 @@ class Ctypent // extends CommonObject
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $code;
 	var $libelle;
 	var $active;

+ 4 - 1
htdocs/core/class/events.class.php

@@ -37,7 +37,10 @@ class Events // extends CommonObject
 	public $element='events';				//!< Id that identify managed objects
 	public $table_element='events';		//!< Name of table without prefix where object is stored
 
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 	
 	/**
      * @var DoliDB Database handler.

+ 4 - 1
htdocs/core/class/notify.class.php

@@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/CMailFile.class.php';
  */
 class Notify
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 	
 	/**
      * @var DoliDB Database handler.

+ 5 - 1
htdocs/core/modules/export/export_csv.modules.php

@@ -30,7 +30,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
  */
 class ExportCsv extends ModeleExports
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $label;
 	var $extension;
 	var $version;

+ 5 - 1
htdocs/core/modules/export/export_excel.modules.php

@@ -32,7 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ExportExcel extends ModeleExports
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $label;
 	var $extension;
 	var $version;

+ 5 - 1
htdocs/core/modules/export/export_excel2007.modules.php

@@ -33,7 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ExportExcel2007 extends ExportExcel
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $label;
 	var $extension;
 	var $version;

+ 5 - 1
htdocs/core/modules/export/export_tsv.modules.php

@@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
  */
 class ExportTsv extends ModeleExports
 {
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
     var $label;
     var $extension;
     var $version;

+ 5 - 1
htdocs/core/modules/import/import_csv.modules.php

@@ -51,7 +51,11 @@ class ImportCsv extends ModeleImports
 	 */
 	public $errors = array ();
 
-    var $id;           // Id of driver
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $label;        // Label of driver
 	var $extension;    // Extension of files imported by driver
 	var $version;      // Version of driver

+ 5 - 1
htdocs/core/modules/import/import_xlsx.modules.php

@@ -50,7 +50,11 @@ class ImportXlsx extends ModeleImports
 	 */
 	public $errors = array();
 
-    var $id;           // Id of driver
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $label;        // Label of driver
 	var $extension;    // Extension of files imported by driver
 	var $version;      // Version of driver

+ 5 - 1
htdocs/core/modules/security/generate/modGeneratePassNone.class.php

@@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpass
  */
 class modGeneratePassNone extends ModeleGenPassword
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $length;
 
 	/**

+ 5 - 1
htdocs/core/modules/security/generate/modGeneratePassPerso.class.php

@@ -33,7 +33,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpass
  */
 class modGeneratePassPerso extends ModeleGenPassword
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $length;
 	var $length2; // didn't overright display
 	var $NbMaj;

+ 5 - 1
htdocs/core/modules/security/generate/modGeneratePassStandard.class.php

@@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpass
  */
 class modGeneratePassStandard extends ModeleGenPassword
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $length;
 
 	/**

+ 4 - 1
htdocs/ecm/class/ecmdirectory.class.php

@@ -31,7 +31,10 @@ class EcmDirectory // extends CommonObject
 	//public $table_element='ecm_directories';	//!< Name of table without prefix where object is stored
 	var $picto = 'dir';
 
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
 	var $label;
 	var $fk_parent;

+ 5 - 1
htdocs/fourn/class/fournisseur.product.class.php

@@ -49,7 +49,11 @@ class ProductFournisseur extends Product
 
     var $product_fourn_price_id;  // id of ligne product-supplier
 
-    var $id;                      // product id
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
 	/**
 	 * @deprecated
 	 * @see ref_supplier

+ 5 - 1
htdocs/product/class/productcustomerprice.class.php

@@ -950,7 +950,11 @@ class Productcustomerprice extends CommonObject
  */
 class PriceByCustomerLine
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	
 	var $entity;
 	var $datec = '';
 	var $tms = '';

+ 4 - 1
htdocs/product/class/propalmergepdfproduct.class.php

@@ -636,7 +636,10 @@ class Propalmergepdfproduct extends CommonObject
  */
 class PropalmergepdfproductLine
 {
-	var $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
 	var $fk_product;
 	var $file_name;

+ 5 - 1
htdocs/product/dynamic_price/class/price_expression.class.php

@@ -44,7 +44,11 @@ class PriceExpression
 	 */
 	public $errors = array();
 	
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
     var $title;
 	var $expression;
     public $table_element = "c_price_expression";

+ 5 - 1
htdocs/product/dynamic_price/class/price_global_variable.class.php

@@ -44,7 +44,11 @@ class PriceGlobalVariable
 	 */
 	public $errors = array();
 	
-    var $id;
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
     var $code;
     var $description;
     var $value;

+ 6 - 1
htdocs/product/dynamic_price/class/price_global_variable_updater.class.php

@@ -46,7 +46,12 @@ class PriceGlobalVariableUpdater
 	
     var $types=array(0, 1);				//!< Updater types
     var $update_min = 5;				//!< Minimal update rate
-    var $id;
+    
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
     var $type;
     var $description;
     var $parameters;

+ 6 - 1
htdocs/supplier_proposal/class/supplier_proposal.class.php

@@ -2653,7 +2653,12 @@ class SupplierProposalLine extends CommonObjectLine
 
     // From llx_supplier_proposaldet
     var $rowid; // deprecated
-    var $id;
+    
+    /**
+	 * @var int ID
+	 */
+	public $id;
+	
     var $fk_supplier_proposal;
     var $fk_parent_line;
     var $desc;          	// Description ligne