Commit Graph

4164 Commits

Author SHA1 Message Date
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
2016-07-06 14:53:05 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
2016-06-22 20:22:22 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should
not.
2016-06-22 20:08:29 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
bba3dc7dcd Make composer cleaner 2016-05-18 13:39:57 +02:00
Laurent Destailleur
9f20779136 Revert "Update escpos-php"
This reverts commit 2f42a226d0.
2016-05-18 13:18:55 +02:00
Laurent Destailleur
e7385c9e4f Try to solve side effect of this fuck... autoload creating a big mess in
a lot of features.
2016-05-18 11:57:13 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
af38d03825 Clean copyright and libs 2016-05-13 23:22:39 +02:00
Laurent Destailleur
d980742b6c Merge pull request #5057 from nka11/restler3.0.0RC6
Update Restler to 3.0.0RC6
2016-05-13 23:15:16 +02:00
Laurent Destailleur
2308d28c19 FIX Add test code to detect/test autoload conflict 2016-05-13 19:23:56 +02:00
nka11
c957cfc260 removing String class which cause server Error with php7 2016-05-11 13:22:58 +02:00
Laurent Destailleur
5a75f346ff Debug advanced selector 2016-05-06 00:02:22 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
nka11
c8432fcccd Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6 2016-04-26 07:37:58 +02:00
Laurent Destailleur
3278c8245b Merge pull request #5020 from frederic34/swiftmailer
Add Swift Mailer to send mails
2016-04-22 20:12:58 +02:00
Laurent Destailleur
ff5f04dee1 Removed not required directories 2016-04-22 11:11:24 +02:00
Laurent Destailleur
d735f5dc70 FIX lost css change 2016-04-22 11:10:20 +02:00
nka11
b60389cec4 Update Restler to 3.0.0RC6 2016-04-21 08:13:19 +02:00
frederic34
567dc1734e Add Swift Mailer to send mails 2016-04-16 18:15:03 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Frédéric FRANCE
f90cffd74a Update nusoap.php
re-establish user-agent
2016-04-09 15:42:53 +02:00
Laurent Destailleur
66ec4cdcf6 Update pdfmake.js 2016-04-08 15:53:13 +02:00
Laurent Destailleur
443c5a490a Update ckeditor to 4.5.8 2016-04-08 15:36:24 +02:00
Laurent Destailleur
9d836571d5 Update PHPExcel 2016-04-08 15:32:13 +02:00
Laurent Destailleur
2f42a226d0 Update escpos-php 2016-04-08 15:30:43 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Laurent Destailleur
b29b5fa71d Merge pull request #4824 from FHenry/dev_jquery
Last version of JQuery 1.12 and DataTables Componenent with working
2016-03-25 16:50:26 +01:00
Laurent Destailleur
a68b704daf FIX Must not return error when vars does not exists 2016-03-25 15:57:36 +01:00
Laurent Destailleur
80e10158a5 Add code comment 2016-03-25 15:57:29 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2b3b24ca9 FIX Must not return error when vars does not exists 2016-03-22 22:01:07 +01:00
Laurent Destailleur
dd26ede0ef Add code comment 2016-03-22 19:24:48 +01:00
Florian HENRY
371e593da3 better includes externel library 2016-03-18 10:56:55 +01:00
Florian HENRY
781059bbb7 add missing lib 2016-03-15 11:59:43 +01:00
Florian HENRY
28391a4e4d Last version of JQuery 1.12 and DataTables Componenent with working
export Excel,CVS,PDF, etc..
2016-03-15 11:57:53 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
bad07bc38c Fix dos and bom and end of line 2016-03-12 18:30:19 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
64374bec00 Fix avoid wrapping in select2 combo list 2016-02-29 15:28:06 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
cf6c06f9e7 Reduce lost space into ckeditor margins 2016-01-28 04:47:31 +01:00
Laurent Destailleur
f3c83fba59 Merge pull request #4201 from GPCsolutions/dolibarr-composer
Composer updates
2016-01-10 11:56:47 +01:00
Laurent Destailleur
40963f2f2a FIX #4207 2015-12-27 18:46:21 +01:00
Laurent Destailleur
2f8fc05cdb Fix: QRcode must not be random 2015-12-20 21:28:05 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
Raphaël Doursenaud
b446aef192 FIX #3868 Upgraded ckeditor to 4.5.6 2015-12-17 22:44:47 +01:00
Regis Houssin
cb7f29b332 Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2015-12-16 13:32:44 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Raphaël Doursenaud
9257bfc5df Updated mobiledetect to 2.8.17 2015-12-07 13:53:59 +01:00
Raphaël Doursenaud
5dfa9ba369 Updated TCPDF to 6.2.12 2015-12-07 13:39:45 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Jean-Pierre Morfin
0cb9cc2213 Correct pattern to match all odt var tags
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
2015-11-12 09:24:04 +01:00
Laurent Destailleur
cb29f91434 FIX An external libray must contains also non obfuscated code into
source
2015-11-11 19:11:43 +01:00
Laurent Destailleur
327d764284 Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr
into GPCsolutions-dolibarr-php7

Conflicts:
	.gitignore
2015-11-11 19:03:36 +01:00
Laurent Destailleur
ca62689a96 Merge pull request #3961 from frederic34/escpos
Escpos : install lib with composer
2015-11-11 18:30:57 +01:00
frederic34
954291ae0b re-add library escpos 2015-11-11 18:02:47 +01:00
frederic34
765e83d456 delete directory 2015-11-11 18:01:13 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF
Previous one has been deprecated by upstream
2015-11-09 12:21:08 +01:00
Raphaël Doursenaud
e5915ce8d9 Upgraded PHPExcel to v1.8.1
Fixes issues with PHP 7
2015-11-09 12:19:48 +01:00
Raphaël Doursenaud
0e155be4e8 Reinstall ckeditor with composer
This time using the correct full package

Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
2015-11-09 12:18:50 +01:00
Raphaël Doursenaud
442431704b Upgraded ADOdb Date to v0.36
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
2015-11-09 12:16:04 +01:00
Raphaël Doursenaud
7c44198022 [Qual] Prevent GIT submodules in composer deps
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
2015-11-09 12:12:05 +01:00
Laurent Destailleur
e78ebf041a Fix deprecated code not working in jcrop. $.browser.msie and $.browser
is no more available in jquery 1.9+.
2015-11-06 02:03:41 +01:00
Laurent Destailleur
2dc644da30 Debug Direct print module using the OAuth setup. 2015-11-06 01:33:49 +01:00
Laurent Destailleur
e4bd99aaf3 Merge pull request #3904 from frederic34/printgcp
Google Cloud Print
2015-11-05 21:57:08 +01:00
Laurent Destailleur
5860491b14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2015-11-05 21:33:54 +01:00
Laurent Destailleur
f3b8df3ea5 Merge pull request #3889 from frederic34/escpos
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
55dfa4859f Install lib with composer 2015-11-05 21:09:14 +01:00
frederic34
3ef6a92bb1 Google Cloud Print 2015-11-05 18:04:00 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp
Printing with Google Cloud Print
2015-11-02 20:09:13 +01:00
Laurent Destailleur
d0d4c5e7f8 NEW The conditional IF into ODT templates works also on not defined var
so we can show data only if defined. Close #3819
2015-11-02 15:44:47 +01:00
frederic34
2f3e6958f9 Receipt Printer 2015-11-01 00:58:08 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Laurent Destailleur
bf85caade6 Move a file that is not an external lib 2015-09-18 21:53:35 +02:00
Laurent Destailleur
397e409b9a Merge pull request #3543 from GPCsolutions/firephp
Installed FirePHP with composer
2015-09-18 20:53:27 +02:00
Laurent Destailleur
a4ab5f5552 Restore manual install of ckeditor. It seems upgrade with phpcomposer
make some plugins not working.
2015-09-18 12:10:47 +02:00
Raphaël Doursenaud
2cf0f240b9 Installed FirePHP with composer 2015-09-17 16:08:00 +02:00
Laurent Destailleur
f3c71a9a5a Dolibarr must not contains autoload feature.
The developer and user must decide which lib is used and it must not be
a random feature that take a library "randomly" (first one found is same
a randomly found).
By default, library embedded of dolibarr must be used. If we want to use
another one, an option to set the path of external libray must be
available.
2015-09-07 12:09:42 +02:00
Laurent Destailleur
51c5e01290 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-05 00:48:56 +02:00
Laurent Destailleur
7926fd8083 NEW ODT generators can set meta properties of ODT file 2015-09-05 00:47:06 +02:00
Raphaël Doursenaud
a6ef289470 New Added client-side Sentry logging
Using Raven.js allows logging client-side javascript errors to the
configured Sentry server.
2015-09-04 19:10:46 +02:00
Raphaël Doursenaud
7ef5cbfb96 Updated raven-php to v0.12.1 2015-09-04 19:10:38 +02:00
Raphaël Doursenaud
e5eefa685f Add Raven client for Sentry 2015-09-04 19:09:55 +02:00
Raphaël Doursenaud
e0312d048b Install TCPDF from composer 2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
321094ab42 Install Restler framework from composer 2015-09-04 19:06:02 +02:00
Raphaël Doursenaud
1b7ed43c60 Install PHPExcel from composer 2015-09-04 19:06:02 +02:00
Raphaël Doursenaud
0eb0f52b6d Install mobiledetect from composer 2015-09-04 19:06:01 +02:00
Raphaël Doursenaud
7d934db183 Install CKEditor from composer 2015-09-04 19:06:01 +02:00
Raphaël Doursenaud
11402debbd Install ChromePHP from composer 2015-09-04 19:06:00 +02:00
Laurent Destailleur
d64a87d980 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/index.php
2015-09-03 10:44:40 +02:00
Laurent Destailleur
2faa5d725e Missing tcpdf files 2015-08-15 18:17:54 +02:00
Florian HENRY
7ce5424f9a NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 2015-07-20 08:41:18 +02:00
Laurent Destailleur
705245d70d Revert "NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 #3258" 2015-07-19 18:07:26 +02:00
Florian HENRY
4f9be3ba7e NEW : upgrade jQuery Component datable 1.10.7 2015-07-16 16:32:38 +02:00
Florian HENRY
390239f505 re-add old file 2015-07-16 15:50:25 +02:00
Florian HENRY
30368053f7 NEW : upgrade version of ColVis datatable extra version 2015-07-16 15:47:57 +02:00
Florian HENRY
2b8e797c63 NEW : upgrade version of ColVis datable extre feature 2015-07-16 15:45:34 +02:00
Regis Houssin
1804dff0b8 Fix: for avoid jquery error in ECM module 2015-07-14 14:40:20 +02:00
Laurent Destailleur
9eff436f5c Merge pull request #3136 from alainabbas/develop
Correct bug #3050
2015-07-04 03:45:46 +02:00
alainabbas
efd3c4d863 Correct bug #3050
when a piece is in draft and odt2pdf.sh is used, the filename is not corrected escaped for the shell
2015-06-25 20:57:01 +02:00
Raphaël Doursenaud
b219381e04 Fix #3098 Updated jQuery BlockUI plugin to 2.70.0 2015-06-25 15:47:26 +02:00
Laurent Destailleur
a3a5b0d9b0 Upgrade jquery and jquery-ui to last stable version 2015-06-21 00:06:37 +02:00
Laurent Destailleur
87b4381d47 Update jflot plugin 2015-06-20 19:17:50 +02:00
Marcos García de La Fuente
1e05262884 Corrected Timezone detection by using jstz external library 2015-06-16 21:19:58 +02:00
Laurent Destailleur
bfe85cbf37 Better error management 2015-05-30 16:14:54 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
jfefe
b503b16f07 NEW : add restler framework
First step to build REST API into Dolibarr
2015-05-01 15:42:05 +02:00
Raphaël Doursenaud
7281ea21e6 Qual: moved mobiledetect external library
External libraries resides in the include directory
2015-04-23 20:30:33 +02:00
Raphaël Doursenaud
e8332cc724 Update PEAR Mail_MIME to 1.8.9
This is nusoap dependency and the unkown previous version
was GPL incompatible and used deprecated functions.
2015-04-18 04:27:15 +02:00
Laurent Destailleur
39a7271f91 Fix bad merge 2015-03-05 10:57:17 +01:00
Laurent Destailleur
09035c1fee Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr
into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php
2015-03-04 20:52:54 +01:00
Laurent Destailleur
7a9de0feca CRLF 2015-03-04 20:45:33 +01:00
frederic34
4af26c119f fetch object in include file 2015-03-02 17:54:35 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Laurent Destailleur
ba98f6f94a Fix: Bad management of error 2015-03-02 01:05:12 +01:00
Laurent Destailleur
495d066cfc Merge pull request #2378 from aspangaro/develop-patch6
Update TCPDF library to 6.2.6
2015-03-02 00:45:50 +01:00
Laurent Destailleur
4781707fa4 Fix jodconverter can't work without the wrapper jodconverter. 2015-02-22 16:01:01 +01:00
Laurent Destailleur
2b4f7a41bf Merge pull request #2377 from aspangaro/develop-patch5
NEW: Update PHPExcel library to 1.8.0
2015-02-21 00:22:21 +01:00
aspangaro
0f08544557 Update TCPDF library to 6.2.6 2015-02-20 06:05:50 +01:00
aspangaro
50990bc862 Update PHPExcel library to 1.8.0 2015-02-20 05:50:36 +01:00
aspangaro
0205848a0e Update FPDI library to 1.5.2
Contain FPDF_TPL natively
2015-02-20 05:21:18 +01:00
aspangaro
014f255f22 Update FPDF_TPL library to 1.2.3 2015-02-20 05:09:07 +01:00
frederic34
07197f3ca0 Add libs 2015-02-17 11:41:50 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
2015-02-07 19:12:22 +01:00
Laurent Destailleur
9c087e27d0 Fix permissions 2015-02-02 13:45:55 +01:00
frederic34
310be3d3b6 Update lib with github.com/mfly/php-ipp 2014-12-28 11:29:53 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Ion Agorria
48e1f4ec55 Library for evaluating math expresions 2014-11-29 06:30:26 +01:00
Laurent Destailleur
d4ad7236e5 Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
Laurent Destailleur
ebb061e68d Merge pull request #1997 from defrance69/patch-26
Update odf.php
2014-11-04 17:37:47 +01:00
Laurent Destailleur
0b41df7c35 Clean code to manage multiselect jquery: All code is centralized
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
2014-11-04 00:33:50 +01:00
BENKE Charles
5586893ca2 Update odf.php
add new fonction getvalue (valuename)
return value inside [valuename][/valuename] tag
2014-11-01 21:00:28 +01:00
Laurent Destailleur
97c9d6bafc Fix dos files 2014-09-07 12:28:58 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
789427b75d Upgrade phpexcel lib to 1.7.8 2014-09-07 12:12:30 +02:00