Changed the name of the module to importorderlines, added compatibili…

…ty with custom folder and updated dependencies
marcosgdf · Dec 19, 2015 · 1720a18 · 1720a18
1 parent c3cc421
commit 1720a18
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/importorderlines/admin/admin.php b/importorderlines/admin/admin.php
@@ -19,7 +19,11 @@
  * along with Multismtp.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require '../../main.inc.php';
+if (file_exists('../../main.inc.php')) {
+	require '../../main.inc.php';
+} else {
+	require '../../../main.inc.php';
+}
 
 $langs->load('admin');
 $langs->load('importorderlines@importorderlines');

diff --git a/importorderlines/class/actions_importorderlines.class.php b/importorderlines/class/actions_importorderlines.class.php
@@ -19,7 +19,7 @@
  * along with Multismtp.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class ActionsImportorderlineexcel
+class ActionsImportorderlines
 {
 	/**
 	 * @param   array()         $parameters     Hook metadatas (context, etc...)

diff --git a/importorderlines/composer.json b/importorderlines/composer.json
@@ -1,6 +1,6 @@
 {
   "require" : {
-      "phpoffice/phpexcel": "1.8"
+      "phpoffice/phpexcel": "~1.8"
   },
   "config" : {
       "vendor-dir" : "lib"

diff --git a/importorderlines/composer.lock b/importorderlines/composer.lock
diff --git a/importorderlines/core/modules/modImportorderlines.class.php b/importorderlines/core/modules/modImportorderlines.class.php
@@ -77,7 +77,7 @@ function __construct($db)
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = 'Import order lines';
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Import order lines from spreasheet files";
+		$this->description = "Imports order lines from spreadsheet files";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = '1.0';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
@@ -106,7 +106,7 @@ function __construct($db)
 		$this->hidden = false;			// A condition to hide module
 		$this->depends = array(
 			'modCommande',
-			'modProducts'
+			'modProduct'
 		);		// List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->conflictwith = array();	// List of modules id this module is in conflict with

diff --git a/importorderlines/langs/es_ES/importorderlines.lang b/importorderlines/langs/es_ES/importorderlines.lang
@@ -1,6 +1,6 @@
 #Module info
-Module402001Name=Importar líneas de pedido desde un archivo Excel
-Module402001Desc=Importa líneas de pedido desde un archivo Excel
+Module402001Name=Importar líneas de pedido desde una hoja de cálculo
+Module402001Desc=Importa líneas de pedido desde una hoja de cálculo
 
 ImportOrderLinesInfo=Información del módulo Importación de líneas de pedido
 ImportOrderLines=Importar líneas de pedido