Merge branch 'new_branch_21_09_2018' of github.com:grandoc/dolibarr into new_branch_21_09_2018

htdocs/core/modules/ticket/mod_ticket_universal.php

@@ -33,20 +33,11 @@ class mod_ticket_universal extends ModeleNumRefTicket
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     /**
      * @var string Error code (or message)
      */
-=======
->>>>>>> upstream/develop
-=======
-    /**
-     * @var string Error code (or message)
-     */
->>>>>>> d5003c9d3c507b5064a1f8e96a1ae9a019b6a5e9
     public $error = '';
 
     /**

htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php

@@ -42,15 +42,15 @@ class doc_generic_user_odt extends ModelePDFUser
 	public $emetteur;
 
 	/**
-   * @var array() Minimum version of PHP required by module.
+   	 * @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
-     */
+     	 * Dolibarr version of the loaded document
+     	 * @public string
+     	 */
 	public $version = 'dolibarr';
 
 

htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

@@ -44,15 +44,15 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	public $emetteur;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+     	 * @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
-     */
+     	 * Dolibarr version of the loaded document
+     	 * @public string
+     	 */
 	public $version = 'dolibarr';