From 501ce96f73d7205cd742a915c91177e50ba75ad0 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 1 Dec 2014 21:56:56 +0100
Subject: [PATCH] Fixed hook class naming conflict with import_multijournal
 module.

---
 hooks.php                      | 12 ++++++------
 import_multijournalentries.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hooks.php b/hooks.php
index 4bc8560..4519114 100644
--- a/hooks.php
+++ b/hooks.php
@@ -1,8 +1,8 @@
 <?php
 define ('SS_IMPORTMULTIJOURNAL', 101<<8);
 
-class hooks_import_multijournalentries extends hooks {
-	var $module_name = 'import_multijournalentries'; 
+class hooks_import_transactions extends hooks {
+	var $module_name = 'import_transations'; 
 
 	/*
 		Install additonal menu options provided by module
@@ -12,16 +12,16 @@ class hooks_import_multijournalentries extends hooks {
 
 		switch($app->id) {
 			case 'GL':
-				$app->add_rapp_function(2, _('Import &Multiple Jourmal Entries'), 
-					$path_to_root.'/modules/import_multijournalentries/import_multijournalentries.php', 'SA_CSVMULTIJOURNALIMPORT');
+				$app->add_rapp_function(2, _('Import &Transactions'), 
+					$path_to_root.'/modules/import_transactions/import_multijournalentries.php', 'SA_CSVMULTIJOURNALIMPORT');
 		}
 	}
 
 	function install_access()
 	{
-		$security_sections[SS_IMPORTMULTIJOURNAL] =	_("Import Multiple Journal Entries");
+		$security_sections[SS_IMPORTMULTIJOURNAL] =	_("Import Transactions");
 
-		$security_areas['SA_CSVMULTIJOURNALIMPORT'] = array(SS_IMPORTMULTIJOURNAL|101, _("Import Multiple Journal Entries"));
+		$security_areas['SA_CSVMULTIJOURNALIMPORT'] = array(SS_IMPORTMULTIJOURNAL|101, _("Import Transactions"));
 
 		return array($security_areas, $security_sections);
 	}
diff --git a/import_multijournalentries.php b/import_multijournalentries.php
index f293b94..2daba22 100644
--- a/import_multijournalentries.php
+++ b/import_multijournalentries.php
@@ -39,7 +39,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); //link to other includes
 include_once($path_to_root . "/includes/date_functions.inc"); //sql2date, is_date_in_fiscal_year
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/admin/db/company_db.inc"); //default control accounts
-include_once($path_to_root . "/modules/import_multijournalentries/includes/import_multijournalentries.inc"); //functions used
+include_once($path_to_root . "/modules/import_transactions/includes/import_multijournalentries.inc"); //functions used
 //include_once($path_to_root . "/gl/includes/ui/gl_journal_ui.inc"); display_import_items adapted from display_ gl_items
 
 add_access_extensions();
-- 
2.30.2