Merge remote-tracking branch 'upstream/develop' into camelCaps

2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -28,7 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModeleAction extends CommonDocGenerator
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**
     *  Return list of active generation modules
--- a/htdocs/core/modules/bank/modules_bank.php
+++ b/htdocs/core/modules/bank/modules_bank.php
@@ -31,7 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModeleBankAccountDoc extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -33,7 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php';    // This is to inc
 class modPhpbarcode extends ModeleBarCode
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $error='';
+	
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -32,7 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php';	   // This is to inc
 class modTcpdfbarcode extends ModeleBarCode
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $error='';
+	
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
+	
 	var $is2d = false;
 	
 	/**
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -29,7 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 */
 abstract class ModeleBarCode
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -50,7 +53,10 @@ abstract class ModeleBarCode
 */
 abstract class ModeleNumRefBarCode
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**     Return default description of numbering model
     *
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -31,7 +31,10 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='CHK';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $name='Mint';


--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requ
 */
 abstract class ModeleNumRefChequeReceipts
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
@@ -119,7 +122,10 @@ abstract class ModeleNumRefChequeReceipts
 */
 abstract class ModeleChequeReceipts extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *  Return list of active generation modules
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -31,7 +31,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='CO';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Marbre';


--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -39,7 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 */
 abstract class ModelePDFCommandes extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *  Return list of active generation modules
@@ -72,7 +75,10 @@ abstract class ModelePDFCommandes extends CommonDocGenerator

 abstract class ModeleNumRefCommandes
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -30,7 +30,10 @@ class mod_contract_serpis extends ModelNumRefContracts
 {
 	var $version='dolibarr';
 	var $prefix='CT';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Serpis';
 	var $code_auto=1;

--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -37,7 +37,10 @@
 */
 abstract class ModelePDFContract extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -68,7 +71,10 @@ abstract class ModelePDFContract extends CommonDocGenerator
 */
 class ModelNumRefContracts
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 */
 abstract class ModeleDon extends CommonDocGenerator
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**
     *  Return list of active generation modules
@@ -64,7 +67,10 @@ abstract class ModeleDon extends CommonDocGenerator
 */
 abstract class ModeleNumRefDons
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**
     * 	Return if a module can be used or not
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -30,7 +30,10 @@ class mod_expedition_safor extends ModelNumRefExpedition
 {
 	var $version='dolibarr';
 	var $prefix='SH';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Safor';


--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -36,7 +36,10 @@
 */
 abstract class ModelePdfExpedition extends CommonDocGenerator
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -67,7 +70,10 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
 */
 abstract class ModelNumRefExpedition
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/** Return if a model can be used or not
 	 *
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -30,7 +30,10 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='ER';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Jade';


--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -23,7 +23,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModeleExpenseReport extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -75,7 +78,10 @@ function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $

 abstract class ModeleNumRefExpenseReport
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by liste_modeles
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	var $driverlabel=array();
 	var $driverversion=array();
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -35,7 +35,10 @@ class mod_facture_mars extends ModeleNumRefFactures
 	var $prefixreplacement='FR';
 	var $prefixdeposit='AC';
 	var $prefixcreditnote='AV';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -33,7 +33,10 @@ class mod_facture_terre extends ModeleNumRefFactures
 	var $prefixinvoice='FA';
 	var $prefixcreditnote='AV';
 	var $prefixdeposit='AC';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -37,7 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requ
 */
 abstract class ModelePDFFactures extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *  Return list of active generation modules
@@ -66,7 +69,10 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 */
 abstract class ModeleNumRefFactures
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 * Return if a module can be used or not
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -32,7 +32,10 @@ class mod_pacific extends ModeleNumRefFicheinter
 {
    var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
 	var $prefix='FI';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom = 'pacific';


--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFFicheinter extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -65,7 +68,10 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
 */
 abstract class ModeleNumRefFicheinter
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 * 	Return if a module can be used or not
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -31,7 +31,10 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 {
 	var $version='dolibarr';
 	var $prefix='HL';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Madonna';
 	var $code_auto=1;

--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -38,7 +38,10 @@
 */
 abstract class ModelePDFHoliday extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -69,7 +72,10 @@ abstract class ModelePDFHoliday extends CommonDocGenerator
 */
 class ModelNumRefHolidays
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -36,8 +36,16 @@ class ImportCsv extends ModeleImports
    var $db;
    var $datatoimport;

-	var $error='';
-	var $errors=array();
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
+	
+	/**
+	 *
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array ();

    var $id;           // Id of driver
 	var $label;        // Label of driver
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -36,8 +36,16 @@ class ImportXlsx extends ModeleImports
    var $db;
    var $datatoimport;

-	var $error='';
-	var $errors=array();
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
+	
+	/**
+	 *
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array ();

    var $id;           // Id of driver
 	var $label;        // Label of driver
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *  Return list of active generation modules
@@ -68,7 +71,10 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 */
 abstract class ModeleNumRefDeliveryOrder
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 * Return if a module can be used or not
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -42,7 +42,8 @@ class pdf_standard extends CommonStickerGenerator
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-	function addSticker(&$pdf,$outputlangs,$param) {
+    function addSticker(&$pdf,$outputlangs,$param)
+    {
 		// use this method in future refactoring
 	}

--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 */
 class ModelePDFCards
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -51,7 +51,7 @@ class modBlockedLog extends DolibarrModules
        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
        $this->name = preg_replace('/^mod/i','',get_class($this));
        $this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
        $this->version = 'dolibarr';
        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -145,7 +145,8 @@ class modBlockedLog extends DolibarrModules
     *
     * @return	boolean		True if already used, otherwise False
     */
-    function alreadyUsed() {
+    function alreadyUsed()
+    {

    	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
    	$b=new BlockedLog($this->db);
@@ -204,7 +205,8 @@ class modBlockedLog extends DolibarrModules
 	 * @param      string	$options    Options when enabling module ('', 'noboxes')
 	 * @return     int             		1 if OK, 0 if KO
 	 */
-    function remove($options = '') {
+    function remove($options = '')
+    {

    	global $conf, $user;

--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -64,7 +64,7 @@ class modDav extends DolibarrModules
 		$this->descriptionlong = "davDescription";

 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where DAV is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of image file used for this module.
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -49,7 +49,7 @@ class modModuleBuilder extends DolibarrModules
        $this->name = preg_replace('/^mod/i','',get_class($this));
        $this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
+        $this->version = 'dolibarr';
        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
        // Name of image file used for this module.
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -40,7 +40,7 @@ class modOauth extends DolibarrModules
     *
     *  @param      DoliDB      $db      Database handler
     */
-    function  __construct($db)
+    function __construct($db)
    {
        $this->db = $db ;
        $this->numero = 66000;
@@ -52,7 +52,7 @@ class modOauth extends DolibarrModules
        $this->name = preg_replace('/^mod/i','',get_class($this));
        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
        $this->description = "Enable OAuth authentication";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
        $this->version = 'dolibarr';
        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
        // Name of image file used for this module.
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -40,7 +40,7 @@ class modPrinting extends DolibarrModules
     *
     *  @param      DoliDB      $db      Database handler
     */
-    function  __construct($db)
+    function __construct($db)
    {
        $this->db = $db ;
        $this->numero = 64000;
@@ -50,7 +50,7 @@ class modPrinting extends DolibarrModules
        $this->module_position = 520;
        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
        $this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
        $this->description = "Enable Direct Printing System.";
        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -40,7 +40,7 @@ class modReceiptPrinter extends DolibarrModules
     *
     *  @param      DoliDB      $db      Database handler
     */
-    function  __construct($db)
+    function __construct($db)
    {
        $this->db = $db ;
        $this->numero = 67000;
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -51,7 +51,7 @@ class modWebsite extends DolibarrModules
        $this->name = preg_replace('/^mod/i','',get_class($this));
        $this->description = "Enable to build and serve public web sites with CMS features";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
+        $this->version = 'dolibarr';
        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
        // Name of image file used for this module.
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -31,7 +31,10 @@ class mod_payment_cicada extends ModeleNumRefPayments
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='PAY';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Cicada';


--- a/htdocs/core/modules/payment/modules_payment.php
+++ b/htdocs/core/modules/payment/modules_payment.php
@@ -23,7 +23,10 @@

 abstract class ModeleNumRefPayments
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -43,7 +43,12 @@ class printing_printgcp extends PrintingDriver
    var $google_id = '';
    var $google_secret = '';
    var $error;
-    var $errors = array();
+    /**
+	 *
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array ();
+	
    var $db;

    private $OAUTH_SERVICENAME_GOOGLE = 'Google';
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -41,7 +41,12 @@ class printing_printipp extends PrintingDriver
    var $user;
    var $password;
    var $error;
-    var $errors = array();
+    /**
+	 *
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array ();
+	
    var $db;


--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -41,7 +41,8 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-	function addSticker(&$pdf,$outputlangs,$param) {
+    function addSticker(&$pdf,$outputlangs,$param)
+    {
 		// use this method in future refactoring
 	}

--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 */
 class ModelePDFLabels
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -33,7 +33,10 @@
 */
 abstract class ModelePDFProduct extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -59,7 +62,10 @@ abstract class ModelePDFProduct extends CommonDocGenerator

 abstract class ModeleProductCode
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**     Renvoi la description par defaut du modele de numerotation
     *
--- a/htdocs/core/modules/product_batch/modules_product_batch.class.php
+++ b/htdocs/core/modules/product_batch/modules_product_batch.class.php
@@ -38,7 +38,10 @@
 */
 abstract class ModelePDFProductBatch extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -162,6 +162,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		'task_description'=>$task->description,
 		'task_fk_parent'=>$task->fk_parent,
 		'task_duration'=>$task->duration,
+		'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
 		'task_progress'=>$task->progress,
 		'task_public'=>$task->public,
 		'task_date_start'=>dol_print_date($task->date_start,'day'),
@@ -324,7 +325,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 		'tasktime_fk_user'=>$tasktime['fk_user'],
 		'tasktime_user_name'=>$tasktime['name'],
 		'tasktime_user_first'=>$tasktime['firstname'],
-		'tasktime_fullcivname'=>$tasktime['fullcivname']
+		'tasktime_fullcivname'=>$tasktime['fullcivname'],
+		'tasktime_amountht'=>$tasktime['amountht'],
+		'tasktime_amountttc'=>$tasktime['amountttc'],
+		'tasktime_thm'=>$tasktime['thm'],
 		);
 	}

@@ -707,7 +711,7 @@ class doc_generic_project_odt extends ModelePDFProjects

 						//Time ressources
 						$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-						$sql.= ", u.lastname, u.firstname";
+						$sql.= ", u.lastname, u.firstname, t.thm";
 						$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 						$sql .= " , ".MAIN_DB_PREFIX."user as u";
 						$sql .= " WHERE t.fk_task =".$task->id;
@@ -721,6 +725,35 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$i = 0;
 							$tasks = array();
 							$listlinestasktime = $listlines->__get('taskstimes');
+							if (empty($num)) {
+								$row['rowid']='';
+								$row['task_date']='';
+								$row['task_duration']='';
+								$row['$tasktime']='';
+								$row['note']='';
+								$row['fk_user']='';
+								$row['name']='';
+								$row['firstname']='';
+								$row['fullcivname']='';
+								$row['amountht']='';
+								$row['amountttc']='';
+								$row['thm']='';
+								$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+								foreach($tmparray as $key => $val)
+								{
+									try
+									{
+										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
+									}
+									catch(OdfException $e)
+									{
+									}
+									catch(SegmentException $e)
+									{
+									}
+								}
+								$listlinestasktime->merge();
+							}
 							while ($i < $num)
 							{
 								$row = $this->db->fetch_array($resql);
@@ -732,6 +765,16 @@ class doc_generic_project_odt extends ModelePDFProjects
 									$row['fullcivname']='';
 								}

+								if (!empty($row['thm'])) {
+									$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
+									$defaultvat = get_default_tva($mysoc, $mysoc);
+									$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');;
+								} else {
+									$row['amountht']=0;
+									$row['amountttc']=0;
+									$row['thm']=0;
+								}
+
 								$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);

 								foreach($tmparray as $key => $val)
@@ -893,60 +936,114 @@ class doc_generic_project_odt extends ModelePDFProjects

 				//List of referent

-				$listofreferent=array(
-				'propal'=>array(
-				'title'=>"ListProposalsAssociatedProject",
-				'class'=>'Propal',
-				'table'=>'propal',
-				'test'=>$conf->propal->enabled  && $user->rights->propale->lire),
-				'order'=>array(
-				'title'=>"ListOrdersAssociatedProject",
-				'class'=>'Commande',
-				'table'=>'commande',
-				'test'=>$conf->commande->enabled  && $user->rights->commande->lire),
-				'invoice'=>array(
-				'title'=>"ListInvoicesAssociatedProject",
-				'class'=>'Facture',
-				'table'=>'facture',
-				'test'=>$conf->facture->enabled && $user->rights->facture->lire),
-				'invoice_predefined'=>array(
-				'title'=>"ListPredefinedInvoicesAssociatedProject",
-				'class'=>'FactureRec',
-				'table'=>'facture_rec',
-				'test'=>$conf->facture->enabled  && $user->rights->facture->lire),
-				'order_supplier'=>array(
-				'title'=>"ListSupplierOrdersAssociatedProject",
-				'table'=>'commande_fournisseur',
-				'class'=>'CommandeFournisseur',
-				'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire),
-				'invoice_supplier'=>array(
-				'title'=>"ListSupplierInvoicesAssociatedProject",
-				'table'=>'facture_fourn',
-				'class'=>'FactureFournisseur',
-				'test'=>$conf->fournisseur->enabled  && $user->rights->fournisseur->facture->lire),
-				'contract'=>array(
-				'title'=>"ListContractAssociatedProject",
-				'class'=>'Contrat',
-				'table'=>'contrat',
-				'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
-				'intervention'=>array(
-				'title'=>"ListFichinterAssociatedProject",
-				'class'=>'Fichinter',
-				'table'=>'fichinter',
-				'disableamount'=>1,
-				'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
-				'trip'=>array(
-				'title'=>"ListTripAssociatedProject",
-				'class'=>'Deplacement',
-				'table'=>'deplacement',
-				'disableamount'=>1,
-				'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
-				'agenda'=>array(
-				'title'=>"ListActionsAssociatedProject",
-				'class'=>'ActionComm',
-				'table'=>'actioncomm',
-				'disableamount'=>1,
-				'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire)
+				$listofreferent = array(
+						'propal' => array(
+								'title' => "ListProposalsAssociatedProject",
+								'class' => 'Propal',
+								'table' => 'propal',
+								'test' => $conf->propal->enabled && $user->rights->propale->lire 
+						),
+						'order' => array(
+								'title' => "ListOrdersAssociatedProject",
+								'class' => 'Commande',
+								'table' => 'commande',
+								'test' => $conf->commande->enabled && $user->rights->commande->lire 
+						),
+						'invoice' => array(
+								'title' => "ListInvoicesAssociatedProject",
+								'class' => 'Facture',
+								'table' => 'facture',
+								'test' => $conf->facture->enabled && $user->rights->facture->lire 
+						),
+						'invoice_predefined' => array(
+								'title' => "ListPredefinedInvoicesAssociatedProject",
+								'class' => 'FactureRec',
+								'table' => 'facture_rec',
+								'test' => $conf->facture->enabled && $user->rights->facture->lire 
+						),
+						'proposal_supplier' => array(
+								'title' => "ListSupplierProposalsAssociatedProject",
+								'class' => 'SupplierProposal',
+								'table' => 'supplier_proposal',
+								'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire 
+						),
+						'order_supplier' => array(
+								'title' => "ListSupplierOrdersAssociatedProject",
+								'table' => 'commande_fournisseur',
+								'class' => 'CommandeFournisseur',
+								'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire 
+						),
+						'invoice_supplier' => array(
+								'title' => "ListSupplierInvoicesAssociatedProject",
+								'table' => 'facture_fourn',
+								'class' => 'FactureFournisseur',
+								'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire 
+						),
+						'contract' => array(
+								'title' => "ListContractAssociatedProject",
+								'class' => 'Contrat',
+								'table' => 'contrat',
+								'test' => $conf->contrat->enabled && $user->rights->contrat->lire 
+						),
+						'intervention' => array(
+								'title' => "ListFichinterAssociatedProject",
+								'class' => 'Fichinter',
+								'table' => 'fichinter',
+								'disableamount' => 1,
+								'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire 
+						),
+						'shipping' => array(
+								'title' => "ListShippingAssociatedProject",
+								'class' => 'Expedition',
+								'table' => 'expedition',
+								'disableamount' => 1,
+								'test' => $conf->expedition->enabled && $user->rights->expedition->lire 
+						),
+						'trip' => array(
+								'title' => "ListTripAssociatedProject",
+								'class' => 'Deplacement',
+								'table' => 'deplacement',
+								'disableamount' => 1,
+								'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire 
+						),
+						'expensereport' => array(
+								'title' => "ListExpenseReportsAssociatedProject",
+								'class' => 'ExpenseReportLine',
+								'table' => 'expensereport_det',
+								'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire 
+						),
+						'donation' => array(
+								'title' => "ListDonationsAssociatedProject",
+								'class' => 'Don',
+								'table' => 'don',
+								'test' => $conf->don->enabled && $user->rights->don->lire 
+						),
+						'loan' => array(
+								'title' => "ListLoanAssociatedProject",
+								'class' => 'Loan',
+								'table' => 'loan',
+								'test' => $conf->loan->enabled && $user->rights->loan->read 
+						),
+						'chargesociales' => array(
+								'title' => "ListSocialContributionAssociatedProject",
+								'class' => 'ChargeSociales',
+								'table' => 'chargesociales',
+								'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
+								'test' => $conf->tax->enabled && $user->rights->tax->charges->lire 
+						),
+						'stock_mouvement' => array(
+								'title' => "ListMouvementStockProject",
+								'class' => 'MouvementStock',
+								'table' => 'stock_mouvement',
+								'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW)) 
+						),
+						'agenda' => array(
+								'title' => "ListActionsAssociatedProject",
+								'class' => 'ActionComm',
+								'table' => 'actioncomm',
+								'disableamount' => 1,
+								'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire 
+						) 
 				);

 				//Insert reference
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -33,7 +33,10 @@ class mod_project_simple extends ModeleNumRefProjects
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='PJ';
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom = "Simple";
 	var $name = "Simple";

--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -31,7 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFProjects extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -63,7 +66,10 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 */
 abstract class ModeleNumRefProjects
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *  Return if a module can be used or not
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -33,7 +33,10 @@ class mod_task_simple extends ModeleNumRefTask
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='TK';
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom = "Simple";
 	var $name = "Simple";

--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -32,7 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFTask extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -64,7 +67,10 @@ abstract class ModelePDFTask extends CommonDocGenerator
 */
 abstract class ModeleNumRefTask
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *  Return if a module can be used or not
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -33,7 +33,10 @@ class mod_propale_marbre extends ModeleNumRefPropales
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='PR';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom = "Marbre";


--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requ
 */
 abstract class ModelePDFPropales extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -67,7 +70,10 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 */
 abstract class ModeleNumRefPropales
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 * Return if a module can be used or not
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -72,7 +72,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->langs=$langs;
 		$this->user=$user;

-		if(empty($conf->global->USER_PASSWORD_PATTERN)){
+		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
 			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
 			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
 		}
@@ -201,7 +201,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 *		@param		string	$password	Password to check
 	 *      @return     int					0 if KO, >0 if OK
 	 */
-	function consecutiveInterationSameCharacter($password){
+    function consecutiveInterationSameCharacter($password)
+    {
 		$last = "";
 		$count = 0;
 		$char = str_split($password);
@@ -220,4 +221,3 @@ class modGeneratePassPerso extends ModeleGenPassword
 		return 1;
 	}
 }
-
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 */
 abstract class ModeleGenPassword
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**
     * 		Return if a module can be used or not
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -33,7 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**
     *  Return list of active generation modules
@@ -64,7 +67,10 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 */
 abstract class ModeleThirdPartyCode
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    /**     Renvoi la description par defaut du modele de numerotation
     *
@@ -258,7 +264,10 @@ abstract class ModeleThirdPartyCode
 */
 abstract class ModeleAccountancyCode
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


    /**		Return description of module
--- a/htdocs/core/modules/stock/modules_movement.php
+++ b/htdocs/core/modules/stock/modules_movement.php
@@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFMovement extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -23,7 +23,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFStock extends CommonDocGenerator
 {
-    var $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


    /**
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';	// requir
 */
 abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -65,7 +68,10 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 */
 abstract class ModeleNumRefSuppliersInvoices
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**  Return if a model can be used or not
 	 *
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -37,7 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';	// requir
 */
 abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -70,7 +73,10 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 */
 abstract class ModeleNumRefSuppliersOrders
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**  Return if a model can be used or not
 	 *
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -31,7 +31,10 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='SPAY';
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom='Bronan';


--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -22,7 +22,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 */
 abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -55,7 +58,10 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator

 abstract class ModeleNumRefSupplierPayments
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 *	Return if a module can be used or not
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -33,7 +33,10 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='RQ';               // RQ = Request for quotation
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 	var $nom = "Marbre";


--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requ
 */
 abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
@@ -67,7 +70,10 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 */
 abstract class ModeleNumRefSupplierProposal
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

 	/**
 	 * Return if a module can be used or not
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -424,7 +424,8 @@ class doc_generic_user_odt extends ModelePDFUser
 	}

    // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	function get_substitutionarray_object($object,$outputlangs, $array_key='object') {
+    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    {
 		$array_other=array();
 		foreach($object as $key => $value) {
 			if (!is_array($value) && !is_object($value)) {
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -38,7 +38,10 @@
 */
 abstract class ModelePDFUser extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -38,7 +38,10 @@
 */
 abstract class ModelePDFUserGroup extends CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';


 	/**