Merge remote-tracking branch 'origin/3.7' into 3.8

a462cd23 · Laurent Destailleur · 9e2a0562 · 4a88c9ea · a462cd23 · a462cd23
Commit a462cd23 authored 9 years ago by Laurent Destailleur
--- a/build/rpm/install.forced.php.mandriva
+++ b/build/rpm/install.forced.php.mandriva
@@ -31,5 +31,3 @@ $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf';
-?>
\ No newline at end of file
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -31,5 +31,3 @@ $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf';
-?>
\ No newline at end of file
--- a/dev/codesniffer/README
+++ b/dev/codesniffer/README
--- a/dev/codesniffer/php.ini
+++ b/dev/codesniffer/php.ini
--- a/dev/codesniffer/ruleset.dtd
+++ b/dev/codesniffer/ruleset.dtd
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
--- a/dev/codetemplates/README
+++ b/dev/codetemplates/README
--- a/dev/codetemplates/codetemplates.dtd
+++ b/dev/codetemplates/codetemplates.dtd
--- a/dev/codetemplates/codetemplates.xml
+++ b/dev/codetemplates/codetemplates.xml
--- a/dev/examples/README
+++ b/dev/examples/README
--- a/dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
+++ b/dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
--- a/dev/iso-normes/address_format.txt
+++ b/dev/iso-normes/address_format.txt
--- a/dev/iso-normes/banknumber_format.txt
+++ b/dev/iso-normes/banknumber_format.txt
--- a/dev/iso-normes/xmlexport.txt
+++ b/dev/iso-normes/xmlexport.txt
--- a/dev/phpunit/README
+++ b/dev/phpunit/README
--- a/dev/phpunit/eclipse_setup_for_pti_phpunit.png
+++ b/dev/phpunit/eclipse_setup_for_pti_phpunit.png
--- a/dev/skeletons/build_webservice_from_class.php
+++ b/dev/skeletons/build_webservice_from_class.php
--- a/dev/test/testtcpdf.php
+++ b/dev/test/testtcpdf.php
--- a/doc/images/appicon_128.png
+++ b/doc/images/appicon_128.png
--- a/doc/images/appicon_16.ico
+++ b/doc/images/appicon_16.ico