Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/lib/functions2.lib.php

@@ -2462,7 +2462,7 @@ if (! function_exists('dolEscapeXML'))
  *	@param	int		$color			0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
  *	@return	string					HTML string
  */
-function autoOrMamual($automaticmanual, $case = 1, $color = 0)
+function autoOrManual($automaticmanual, $case = 1, $color = 0)
 {
     global $langs;
     $result='unknown'; $classname='';

htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php

@@ -69,25 +69,56 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 	/**
      * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 2);
+	public $phpmin = array(5, 4);
 
 	/**
      * Dolibarr version of the loaded document
-     * @public string
+     * @var string
      */
 	public $version = 'development';
 
+     /**
+     * @var int page_largeur
+     */
     public $page_largeur;
+	
+	/**
+     * @var int page_hauteur
+     */
     public $page_hauteur;
+	
+	/**
+     * @var array format
+     */
     public $format;
+	
+	/**
+     * @var int marge_gauche
+     */
 	public $marge_gauche;
+	
+	/**
+     * @var int marge_droite
+     */
 	public $marge_droite;
+	
+	/**
+     * @var int marge_haute
+     */
 	public $marge_haute;
+	
+	/**
+     * @var int marge_basse
+     */
 	public $marge_basse;
 
-    public $emetteur;	// Objet societe qui emet
+    /**
+	* Issuer
+	* @var Societe
+	*/
+	public $emetteur;
 
 
 	/**

htdocs/core/modules/facture/doc/pdf_sponge.modules.php

@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_sponge extends ModelePDFFactures
 {
-     /**
+    /**
      * @var DoliDb Database handler
      */
     public $db;
@@ -70,9 +70,9 @@ class pdf_sponge extends ModelePDFFactures
 
 	/**
      * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 2);
+	public $phpmin = array(5, 4);
 
 	/**
      * Dolibarr version of the loaded document
@@ -80,15 +80,46 @@ class pdf_sponge extends ModelePDFFactures
      */
 	public $version = 'development';
 
+     /**
+     * @var int page_largeur
+     */
     public $page_largeur;
+	
+	/**
+     * @var int page_hauteur
+     */
     public $page_hauteur;
+	
+	/**
+     * @var array format
+     */
     public $format;
+	
+	/**
+     * @var int marge_gauche
+     */
 	public $marge_gauche;
+	
+	/**
+     * @var int marge_droite
+     */
 	public $marge_droite;
+	
+	/**
+     * @var int marge_haute
+     */
 	public $marge_haute;
+	
+	/**
+     * @var int marge_basse
+     */
 	public $marge_basse;
 
-	public $emetteur;	// Objet societe qui emet
+    /**
+	* Issuer
+	* @var Societe
+	*/
+	public $emetteur;
 
 	/**
 	 * @var bool Situation invoice type

htdocs/core/modules/modAdherent.class.php

@@ -257,12 +257,12 @@ class modAdherent extends DolibarrModules
         //--------
         $r=0;
 
-        // $this->export_code[$r]          Code unique identifiant l'export (tous modules confondus)
+        // $this->export_code[$r]          Unique code identifying the export (all modules combined)
-        // $this->export_label[$r]         Libelle par defaut si traduction de cle "ExportXXX" non trouvee (XXX = Code)
+        // $this->export_label[$r]         Libelle by default if translation of key "ExportXXX" not found (XXX = Code)
-        // $this->export_permission[$r]    Liste des codes permissions requis pour faire l'export
+        // $this->export_permission[$r]    List of permission codes required to export
-        // $this->export_fields_sql[$r]    Liste des champs exportables en codif sql
+        // $this->export_fields_sql[$r]    List of exportable fields in SQL codiffication
-        // $this->export_fields_name[$r]   Liste des champs exportables en codif traduction
+        // $this->export_fields_name[$r]   List of exportable fields in translation codiffication
-        // $this->export_sql[$r]           Requete sql qui offre les donnees a l'export
+        // $this->export_sql[$r]           SQL query that offers data for export
 
         $r++;
         $this->export_code[$r]=$this->rights_class.'_'.$r;

htdocs/core/modules/modAsset.class.php

@@ -218,12 +218,12 @@ class modAsset extends DolibarrModules
 		//--------
 		$r=1;
 
-		// $this->export_code[$r]          Code unique identifiant l'export (tous modules confondus)
+		// $this->export_code[$r]          Unique code identifying the export (all modules combined)
-		// $this->export_label[$r]         Libelle par defaut si traduction de cle "ExportXXX" non trouvee (XXX = Code)
+		// $this->export_label[$r]         Libelle by default if translation of key "ExportXXX" not found (XXX = Code)
-		// $this->export_permission[$r]    Liste des codes permissions requis pour faire l'export
+		// $this->export_permission[$r]    List of permission codes required to export
-		// $this->export_fields_sql[$r]    Liste des champs exportables en codif sql
+		// $this->export_fields_sql[$r]    List of exportable fields in SQL codiffication
-		// $this->export_fields_name[$r]   Liste des champs exportables en codif traduction
+		// $this->export_fields_name[$r]   List of exportable fields in translation codiffication
-		// $this->export_sql[$r]           Requete sql qui offre les donnees a l'export
+		// $this->export_sql[$r]           SQL query that offers data for export
 
 		/*
 		$r++;

htdocs/core/modules/propale/doc/pdf_cyan.modules.php

@@ -7,7 +7,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,23 +45,79 @@ class pdf_cyan extends ModelePDFPropales
      * @var DoliDb Database handler
      */
     public $db;
-	public $name;
-	public $description;
-	public $update_main_doc_field;	// Save the name of generated file as the main doc when generating a doc with this template
-	public $type;
 
-	public $phpmin = array(5, 4); // Minimum version of PHP required by module
+	/**
+     * @var string model name
+     */
+    public $name;
+
+	/**
+     * @var string model description (short text)
+     */
+    public $description;
+
+    /**
+     * @var int     Save the name of generated file as the main doc when generating a doc with this template
+     */
+    public $update_main_doc_field;
+
+	/**
+     * @var string document type
+     */
+    public $type;
+
+	/**
+     * @var array() Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+     */
+	public $phpmin = array(5, 4);
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
 	public $version = 'development';
 
-	public $page_largeur;
+     /**
-	public $page_hauteur;
+     * @var int page_largeur
-	public $format;
+     */
+    public $page_largeur;
+	
+	/**
+     * @var int page_hauteur
+     */
+    public $page_hauteur;
+	
+	/**
+     * @var array format
+     */
+    public $format;
+	
+	/**
+     * @var int marge_gauche
+     */
 	public $marge_gauche;
+	
+	/**
+     * @var int marge_droite
+     */
 	public $marge_droite;
+	
+	/**
+     * @var int marge_haute
+     */
 	public $marge_haute;
+	
+	/**
+     * @var int marge_basse
+     */
 	public $marge_basse;
 
-	public $emetteur;	// Objet societe qui emet
+    /**
+	* Issuer
+	* @var Societe
+	*/
+	public $emetteur;
 
 
 	/**