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

615ffe54 · Laurent Destailleur · dbaa43f3 · 200a6d3c · 615ffe54 · 615ffe54
Commit 615ffe54 authored 9 years ago by Laurent Destailleur
--- a/dev/initdata/documents_demo/.htaccess
+++ b/dev/initdata/documents_demo/.htaccess
+Order allow,deny
+Deny from all
--- a/dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
+++ b/dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
--- a/dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
+++ b/dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
--- a/dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
+++ b/dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
--- a/dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
+++ b/dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
--- a/dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
+++ b/dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
--- a/dev/initdata/documents_demo/custom/main.inc.php
+++ b/dev/initdata/documents_demo/custom/main.inc.php
+<?php
+// Wrapper to include main into htdocs
+include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/main.inc.php';
--- a/dev/initdata/documents_demo/custom/master.inc.php
+++ b/dev/initdata/documents_demo/custom/master.inc.php
+<?php
+// Wrapper to include master into htdocs
+include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/master.inc.php';
--- a/dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
+++ b/dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
--- a/dev/initdata/documents_demo/doctemplates/orders/template_order.odt
+++ b/dev/initdata/documents_demo/doctemplates/orders/template_order.odt
--- a/dev/initdata/documents_demo/doctemplates/projects/template_project.odt
+++ b/dev/initdata/documents_demo/doctemplates/projects/template_project.odt
--- a/dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
+++ b/dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
--- a/dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
+++ b/dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
--- a/dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
+++ b/dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
--- a/dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
+++ b/dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
--- a/dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
+++ b/dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
--- a/dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
+++ b/dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
--- a/dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
+++ b/dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
--- a/dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
+++ b/dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
--- a/dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
+++ b/dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf