lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: redirect to company setup if company name is not defined (first install)

Browse Source 
New: Work on multicompany
This commit is contained in:
Regis Houssin 2010-10-21 08:17:59 +00:00
parent 1a91642a15
commit 66eab0c5b8
3 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/index.php
View File

@ -56,6 +56,13 @@ if (class_exists('Smartphone'))
exit; exit;
} }
// Check if company name is defined (first install)
if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))
{
header("Location: ".DOL_URL_ROOT."/admin/company.php?mainmenu=home&leftmenu=setup");
exit;
}
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("HomeArea")); print_fiche_titre($langs->trans("HomeArea"));

2
htdocs/install/etape5.php
View File

@ -312,7 +312,7 @@ if ($_POST["action"] == "set")
print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>"; print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
print '<center><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">'; print '<center><a href="../admin/company.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
print $langs->trans("GoToSetupArea"); print $langs->trans("GoToSetupArea");
print '</a></center>'; print '</a></center>';
} }

31
htdocs/install/mysql/tables/llx_entity.sql
View File

@ -1,31 +0,0 @@
-- ============================================================================
-- Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-- $Id$
-- ===========================================================================
create table llx_entity
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
label varchar(255) NOT NULL,
description text,
datec datetime,
fk_user_creat integer,
visible tinyint DEFAULT 1 NOT NULL,
active tinyint DEFAULT 1 NOT NULL
) type=innodb;