diff --git a/build/exe/doliwamp/doliwamp2.4.iss b/build/exe/doliwamp/doliwamp2.4.iss index 85203606540..3450313c15b 100644 --- a/build/exe/doliwamp/doliwamp2.4.iss +++ b/build/exe/doliwamp/doliwamp2.4.iss @@ -1,13 +1,16 @@ -; -- Doliwamp.iss -- +; ----- DoliWamp.iss --------------------------------------------------------------------- ; Script to build an auto installer for Dolibarr. ; Idea from WampServer 2 (http://www.wampserver.com) -; +;---------------------------------------------------------------------------------------- ; You must edit some path in this file to build an exe. ; WARNING: Be sure that user files for Mysql data used to build ; package contains only user root with no password. ; For this, you can edit mysql.user table for a database to keep ; only root user with no password, stop server and catch ; files user.MY* to put them in data sources. +; +; Version: $Id$ +;---------------------------------------------------------------------------------------- [Setup] @@ -138,7 +141,7 @@ var batFile: String; function InitializeSetup(): Boolean; begin - Result := MsgBox('You will install Doliwamp (Apache+Mysql+PHP+Dolibarr) on your computer.' #13#13 'This setup install Dolibarr and third party softwares (Apache, Mysql and PHP) configured for ' #13 'a Dolibarr usage and could not be used for other reasons.' #13#13 'If you want to share your Apache, Mysql and PHP with other projects, you should make a manual' #13 'installation of Dolibarr on your own Apache, Mysql and PHP installation.' #13#13 'Do you want to continue install?', mbConfirmation, MB_YESNO) = idYes; + Result := MsgBox('You will install DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.' #13#13 'This setup install Dolibarr and third party softwares (Apache, Mysql and PHP) configured for ' #13 'a Dolibarr usage.' #13#13 'If you want to share your Apache, Mysql and PHP with other projects then Dolibarr, it is recommended to make a manual' #13 'installation of Dolibarr on your own Apache, Mysql and PHP installation.' #13#13 'Do you want to continue install?', mbConfirmation, MB_YESNO) = idYes; end; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 5f64bccb804..43576494722 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -183,8 +183,8 @@ if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"]) } } - Header("Location: fiche.php?rowid=".$adh->id); - exit; + $_GET["rowid"]=$adh->id; + $_REQUEST["action"]=''; } else { diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 81c60e8bac4..7fd77b89d92 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -232,6 +232,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') $var=!$var; print ''.$langs->trans("Country").''; $form->select_pays($conf->global->MAIN_INFO_SOCIETE_PAYS,'pays_id',($conf->use_javascript_ajax?' onChange="company_save_refresh()"':'')); + if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1); print ''."\n"; $var=!$var; diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 8ae5247ab95..44ee0b4f999 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005 Simon Tosser * * This program is free software; you can redistribute it and/or modify @@ -204,7 +204,7 @@ else $var=!$var; - if (1== 1) + if ($conf->agenda->enabled) { print ''; print ''.img_object('','task').''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index b086687a512..e228cfa3e97 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -165,7 +165,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Activer onglet preview $var=!$var; print ''.$langs->trans("UsePreviewTabs").''; - print $html->selectyesno('main_use_preview_tabs',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:1,1); + print $html->selectyesno('main_use_preview_tabs',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0,1); print ''; print ' '; print ''; @@ -297,7 +297,7 @@ else // Activer onglet preview $var=!$var; print ''.$langs->trans("UsePreviewTabs").''; - print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:1).""; + print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0).""; print ' '; print ""; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 1080b625423..75752a4551a 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -72,8 +72,7 @@ if ($_GET["facid"] > 0) } $head = facture_prepare_head($fac); - $hselected = $conf->use_preview_tabs ? 2 : false; - dolibarr_fiche_head($head, $hselected, $langs->trans("InvoiceCustomer")); + dolibarr_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer")); /* diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 164582d9019..1aec097f18a 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -101,11 +101,7 @@ if ($_GET["facid"]) $soc->fetch($fac->socid); $head = facture_prepare_head($fac); - $hselected = 2; - if ($conf->use_preview_tabs) $hselected++; - if ($fac->mode_reglement_code == 'PRE') $hselected++; - - dolibarr_fiche_head($head, $hselected, $langs->trans("InvoiceCustomer")); + dolibarr_fiche_head($head, 'note', $langs->trans("InvoiceCustomer")); print ''; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index c6c71309184..b2bf9f545d0 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -112,9 +112,7 @@ if ($_GET["facid"] > 0) } $head = facture_prepare_head($fac); - $hselected = 2; - if ($conf->use_preview_tabs) $hselected++; - dolibarr_fiche_head($head, $hselected, $langs->trans('InvoiceCustomer')); + dolibarr_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer')); /* * Facture diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index b85c755348e..79320133f40 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -365,7 +365,7 @@ class Conf if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // conf->use_preview_tabs - $this->use_preview_tabs=1; + $this->use_preview_tabs=0; if (isset($this->global->MAIN_USE_PREVIEW_TABS)) $this->use_preview_tabs=$this->global->MAIN_USE_PREVIEW_TABS; // conf->use_javascript_ajax diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php index 6ef6b9227b2..f4f071c46e1 100644 --- a/htdocs/lib/invoice.lib.php +++ b/htdocs/lib/invoice.lib.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2008 Laurent Destailleur * * 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 @@ -15,15 +15,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ - * - * $Id$ - * $Source$ */ /** \file htdocs/lib/invoice.lib.php \brief Ensemble de fonctions de base pour le module factures - \version $Revision$ + \version $Id$ Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 8befbd3fc1f..087b09092c8 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -60,6 +60,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_NOT_INSTA insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_POPUP_CALENDAR','eldy','chaine','Popup calendar module',0); +insert into llx_const(name,value,type,visible,note) values('SYSLOG_LEVEL','6','chaine',0,'Level of debug info to show'); insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0);