Fixed hook class naming conflict with import_multijournal module.

diff --git a/hooks.php b/hooks.php
index 4bc85604e3d7009c8d4187d7d537162b590dc0fa..4519114e9b9dae1c3ff0d98776cde9e00b6641be 100644 (file)
--- a/hooks.php
+++ b/hooks.php
@@ -1,8 +1,8 @@
 <?php
 define ('SS_IMPORTMULTIJOURNAL', 101<<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
 
        /*
                Install additonal menu options provided by module


@@ -12,16 +12,16 @@ class hooks_import_multijournalentries extends hooks {
 
                switch($app->id) {
                        case 'GL':
 
                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()
        {
                }
        }
 
        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);
        }
 
                return array($security_areas, $security_sections);
        }

diff --git a/import_multijournalentries.php b/import_multijournalentries.php
index f293b94a630cc2fab425616ab682a8d36fdeaaf6..2daba222c676f009f6cad75a9b9912107b3795bd 100644 (file)
--- 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 . "/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();
 //include_once($path_to_root . "/gl/includes/ui/gl_journal_ui.inc"); display_import_items adapted from display_ gl_items
 
 add_access_extensions();