lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6

Browse Source
This commit is contained in:
aspangaro 2016-01-24 07:04:20 +01:00
commit e5808f876d
199 changed files with 1150 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/initdata/documents_demo/.htaccess Normal file
View File

@ -0,0 +1,2 @@
Order allow,deny
Deny from all

BIN
dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf Normal file
View File

Binary file not shown.

3
dev/initdata/documents_demo/custom/main.inc.php Normal file
View File

@ -0,0 +1,3 @@
<?php
// Wrapper to include main into htdocs
include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/main.inc.php';

3
dev/initdata/documents_demo/custom/master.inc.php Normal file
View File

@ -0,0 +1,3 @@
<?php
// Wrapper to include master into htdocs
include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/master.inc.php';

BIN
dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/doctemplates/orders/template_order.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/doctemplates/projects/template_project.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/mycompany/logos/mybigcompany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 81 KiB

BIN
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1019 B

BIN
dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf Normal file
View File

Binary file not shown.

BIN
dev/initdata/documents_demo/societe/1/logos/indiancompany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

0
dev/initdata/img/pierrecurie.jpg → dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
dev/initdata/documents_demo/societe/13/logos/companycorp2company.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

0
dev/initdata/img/bookkeepercompany.png → dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
dev/initdata/documents_demo/societe/2/logos/teclibcompany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
dev/initdata/documents_demo/societe/25/logos/printcompany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
dev/initdata/documents_demo/societe/3/logos/spanishcompany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

Some files were not shown because too many files have changed in this diff Show More