Merge remote-tracking branch 'origin/3.9' into 4.0

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php

dev/initdata/generate-invoice.php

@@ -31,8 +31,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]);
+//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+require (__DIR__. '/../../htdocs/master.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 

dev/initdata/generate-order.php

@@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
+//$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

dev/initdata/generate-product.php

@@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
+//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

dev/initdata/generate-proposal.php

@@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
+//$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+require (__DIR__. '/../../htdocs/master.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

dev/initdata/generate-thirdparty.php

@@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
+//$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../../htdocs/master.inc.php");
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ currencySymbol	= kr
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NUL!
 DIV0	= #DIVISION/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= €
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NULL!
 DIV0	= #DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= $	##	I'm surprised that the Excel Documentation suggests $ rath
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #¡NULO!
 DIV0	= #¡DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= $	#	Symbol not known, should it be a € (Euro)?
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #TYHJÄ!
 DIV0	= #JAKO/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= €
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NUL!
 DIV0	= #DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= €
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NULLO!
 DIV0	= #DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= €
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #LEEG!
 DIV0	= #DEEL/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= kr
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NULL!
 DIV0	= #DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= zł
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #ZERO!
 DIV0	= #DZIEL/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= R$
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NULO!
 DIV0	= #DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= €
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #NULO!
 DIV0	= #DIV/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= р
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #ПУСТО!
 DIV0	= #ДЕЛ/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= kr
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #Skärning!
 DIV0	= #Division/0!

htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config

@@ -1,6 +1,6 @@
 ##
 ## PHPExcel
-##
+##
 ## Copyright (c) 2006 - 2013 PHPExcel
 ##
 ## This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ currencySymbol	= YTL
 
 
 ##
-##	Excel Error Codes	(For future use)
+##	Excel Error Codes	(For future use)
 ##
 NULL	= #BOŞ!
 DIV0	= #SAYI/0!

test/phpunit/FilesLibTest.php

@@ -399,4 +399,23 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".join(',',$result)."\n";
         $this->assertEquals(0,count($result));
     }
+    
+    /**
+     * testDolDirList
+     *
+     * @return	string
+     *
+     * @depends	testDolCompressUnCompress
+     * The depends says test is run only if previous is ok
+     */
+    public function testDolDirList()
+    {
+        global $conf,$user,$langs,$db;
+    
+        // Scan dir to guaruante we on't have library jquery twice (we accept exception of duplicte into ckeditor because all dir is removed for debian package, so there is no duplicate).
+        $founddirs=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
+        print __METHOD__." count(founddirs)=".count($founddirs)."\n";
+        $this->assertEquals(1,count($founddirs));
+    }
+
 }