diff --git a/.travis.yml b/.travis.yml
index 81da87158f0..3c50ca1ba0f 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 502bb7d212e..64c55494fee 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 00000000000..db7b69e1bdd
--- /dev/null
+++ b/htdocs/websites/indexold.php
@@ -0,0 +1,65 @@
+
+ *
+ * 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 .
+ *
+ */
+
+/**
+ * \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 "
+
+
+Dolibarr frame for web site menu
+
+
+
+
+<![CDATA[
+<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>
+]]>
+
+
+";
+
+