diff --git a/.travis.yml b/.travis.yml
index 81da87158f0c038600002660633b1a1622ab9d1e..3c50ca1ba0f0c3192139e444a4cd2aa1cc2b889c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -290,7 +290,7 @@ script:
- |
echo "Unit testing"
# Ensure we catch errors. Set this to +e if you want to go to this end to see log file.
- set -e
+ set +e
phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
set +e
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 502bb7d212e3794f73e5398e82f833fa2e6d2f51..64c55494feeb045b33876a51f1c48df4c1daea9d 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1803,7 +1803,7 @@ class Facture extends CommonInvoice
|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
{
$this->error='Permission denied';
- dol_syslog(get_class($this)."::validate ".$this->error, LOG_ERR);
+ dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
return -1;
}
diff --git a/htdocs/websites/indexold.php b/htdocs/websites/indexold.php
new file mode 100644
index 0000000000000000000000000000000000000000..db7b69e1bddd69ad050b015b10fa649bd99b3222
--- /dev/null
+++ b/htdocs/websites/indexold.php
@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file htdocs/externalsite/frames.php
+ * \ingroup externalsite
+ * \brief Page that build two frames: One for menu, the other for the target page to show
+ * \author Laurent Destailleur
+ */
+
+require '../main.inc.php';
+
+$langs->load("website");
+
+
+$mainmenu=GETPOST('mainmenu', 'alpha');
+$leftmenu=GETPOST('leftmenu', 'alpha');
+$idmenu=GETPOST('idmenu', 'int');
+$theme=GETPOST('theme', 'alpha');
+$codelang=GETPOST('lang', 'alpha');
+
+print "
+<html>
+<head>
+<title>Dolibarr frame for web site menu</title>
+</head>
+
+<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".($heightforframes+50).",*\" border=0 framespacing=0 frameborder=0>
+ <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
+ <frame name=\"main\" src=\"framebottom.php\">
+ <noframes>
+ <body>
+
+ </body>
+ </noframes>
+</frameset>
+
+<noframes>
+<body>
+ <br><div class=\"center\">
+ Sorry, your browser is too old or not correctly configured to view this area.<br>
+ Your browser must support frames.<br>
+ </div>
+</body>
+</noframes>
+
+</html>
+";
+
+