Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/upstream/3.8' into 3.8
- Loading branch information
Showing
462 changed files
with
1,762 additions
and
911 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<VirtualHost *:80> | ||
DocumentRoot %TRAVIS_BUILD_DIR%/htdocs | ||
|
||
<Directory "%TRAVIS_BUILD_DIR%/htdocs"> | ||
Options FollowSymLinks MultiViews ExecCGI | ||
AllowOverride All | ||
Order deny,allow | ||
Allow from all | ||
</Directory> | ||
|
||
# Wire up Apache to use Travis CI's php-fpm. | ||
<IfModule mod_fastcgi.c> | ||
AddHandler php5-fcgi .php | ||
Action php5-fcgi /php5-fcgi | ||
Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi | ||
FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization | ||
</IfModule> | ||
</VirtualHost> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Order allow,deny | ||
Deny from all |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<?php | ||
// Wrapper to include main into htdocs | ||
include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/main.inc.php'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<?php | ||
// Wrapper to include master into htdocs | ||
include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/master.inc.php'; |
Binary file added
BIN
+37.1 KB
dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+28.7 KB
dev/initdata/documents_demo/doctemplates/projects/template_project.odt
Binary file not shown.
Binary file added
BIN
+25.3 KB
dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
Binary file not shown.
Binary file added
BIN
+20.8 KB
dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
Binary file not shown.
Binary file added
BIN
+23.7 KB
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
Binary file not shown.
Binary file added
BIN
+17.6 KB
dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+18.1 KB
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
Binary file not shown.
Binary file added
BIN
+18.1 KB
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+47.7 KB
dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+47.6 KB
dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+47.7 KB
dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+17.7 KB
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
Binary file not shown.
Binary file added
BIN
+17.8 KB
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
Binary file not shown.
Binary file added
BIN
+17.7 KB
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.26 KB
dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+10.3 KB
dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.2 KB
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.2 KB
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+16.7 KB
dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.94 KB
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+81.2 KB
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.9 KB
...nitdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.39 KB
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.91 KB
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+3.62 KB
...ments_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.7 KB
dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1019 Bytes
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.36 KB
dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.93 KB
dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+13.6 KB
dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.15 KB
dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+10.6 KB
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
Oops, something went wrong.
Binary file added
BIN
+9.5 KB
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+9.72 KB
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
Oops, something went wrong.
Binary file added
BIN
+29.6 KB
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
Oops, something went wrong.
File renamed without changes
Binary file added
BIN
+1.9 KB
dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
Oops, something went wrong.
Binary file added
BIN
+4.77 KB
dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+6.01 KB
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
Oops, something went wrong.
Binary file added
BIN
+18.5 KB
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
Oops, something went wrong.
File renamed without changes
Binary file added
BIN
+8.25 KB
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
Oops, something went wrong.
Binary file added
BIN
+8.98 KB
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+4.49 KB
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
Oops, something went wrong.
Binary file added
BIN
+13 KB
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+6.6 KB
dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
Oops, something went wrong.
Binary file added
BIN
+25.2 KB
dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+3.87 KB
dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
Oops, something went wrong.
Binary file added
BIN
+12.4 KB
dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+6.66 KB
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
Oops, something went wrong.
Binary file added
BIN
+18.3 KB
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
Oops, something went wrong.
Binary file added
BIN
+5.04 KB
dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
Oops, something went wrong.
Binary file added
BIN
+14.2 KB
dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+6.51 KB
dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
Oops, something went wrong.
Binary file added
BIN
+19.3 KB
dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+7.95 KB
dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
Oops, something went wrong.
Binary file added
BIN
+22.3 KB
dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+5.99 KB
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
Oops, something went wrong.
Binary file added
BIN
+17.4 KB
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
Oops, something went wrong.
File renamed without changes
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
File renamed without changes
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+3.27 KB
dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
Oops, something went wrong.
File renamed without changes
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+1.71 KB
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
Oops, something went wrong.
Binary file added
BIN
+4.04 KB
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
Oops, something went wrong.
Diff not rendered.
Diff not rendered.
Oops, something went wrong.