From ad061f4e133d65a79b34c228784b2ff6c4360d86 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 18 Sep 2018 11:14:21 +0200
Subject: [PATCH] Standardize and update code

---
 .../doc/doc_generic_product_odt.modules.php      | 16 +++++++---------
 .../task/doc/doc_generic_task_odt.modules.php    | 11 ++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index a0ea27f66c6..ca50317fe81 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -36,10 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_product_odt extends ModelePDFProduct
 {
-	var $emetteur;	// Objet societe qui emet
+	public $emetteur;	// Objet societe qui emet
 
-	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
-	var $version = 'dolibarr';
+	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+	public $version = 'dolibarr';
 
 
 	/**
@@ -49,7 +49,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
         $langs->loadLangs(array("main","companies"));
@@ -94,7 +94,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
         $langs->loadLangs(array("errors","companies"));
@@ -227,10 +227,8 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("bills");
+		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
+
 		if ($conf->produit->dir_output)
 		{
 			// If $object is id instead of object
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index c54bb797c64..7846c68af7a 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -54,10 +54,10 @@ if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/
  */
 class doc_generic_task_odt extends ModelePDFTask
 {
-	var $emetteur;	// Objet societe qui emet
+	public $emetteur;	// Objet societe qui emet
 
-	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
-	var $version = 'dolibarr';
+	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+	public $version = 'dolibarr';
 
 
 	/**
@@ -432,10 +432,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("projects");
+		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
 		if ($conf->projet->dir_output)
 		{