Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

4390 Commits

Author SHA1 Message Date
Laurent Destailleur
c787ed1793 FIX Upgrade ckeditor manually. Fix regression introduced by composer 
past upgrade that download a bugged non official code of ckeditor.
 2019-04-12 17:01:25 +02:00
Laurent Destailleur
c2badb57d7 NEW: Add module debugbar 2019-03-16 16:27:14 +01:00
Frédéric FRANCE
73740bc10e
autoloader for egulias lib needed by swiftmailer 2019-03-02 14:35:05 +01:00
Laurent Destailleur
47ad3e8198 NEW Upgrade jquery lib to 3.3.1 2019-03-02 12:07:52 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
 2019-02-13 09:23:52 +01:00
Laurent Destailleur
3daa8b0731
Merge pull request #10550 from frederic34/patch-21 
continue is ambiguous in outer loop for php 7.3
 2019-02-12 13:18:34 +01:00
Laurent Destailleur
771cd476ee Update ckeditor 2019-02-12 03:57:16 +01:00
Laurent Destailleur
8ca939d2c1 Update tcpdf to 6.2.26 2019-02-12 03:32:22 +01:00
Laurent Destailleur
f69f574eff Upgrade lib escpos-php 2019-02-12 03:28:17 +01:00
Frédéric FRANCE
a16ff4e368
Update OLE.php 2019-02-11 22:29:59 +01:00
Laurent Destailleur
5c2b9e3078 NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
Laurent Destailleur
b1559dbc39 Fix perms 2019-01-05 15:22:24 +01:00
Laurent Destailleur
e2269796e2
Merge branch 'develop' into swiftmailer 2018-11-19 18:23:55 +01:00
Frédéric FRANCE
532ce34c53
i put the sword under the carpet 2018-11-15 21:36:20 +01:00
Frédéric FRANCE
7c241620c0
replace random_bytes 2018-11-15 21:20:09 +01:00
Frédéric FRANCE
482c6efdd9
replace php > 5.4 code 2018-11-15 20:35:40 +01:00
Frédéric FRANCE
caa080f103
replace php > 5.4 code 2018-11-15 20:32:51 +01:00
Frédéric FRANCE
92cda2a75c
fix cant use method return value 2018-11-14 23:29:24 +01:00
Frédéric FRANCE
b13ad8170f
correctly check intl extension 2018-11-14 22:42:09 +01:00
Frédéric FRANCE
1c15d249b3
replace specific php7 code 2018-11-14 22:05:21 +01:00
Laurent Destailleur
c266084db7
Merge pull request #9841 from laudeco/fix/9824_pdf_merge 
FIX the pdf merge
 2018-10-24 02:31:48 +02:00
De Coninck Laurent
59307165ce fix the pdf merge 
fix the pdf merge.

[See: #9824]
 2018-10-21 19:45:33 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes 
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
 2018-09-15 13:31:25 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Jean Traullé
c0f98ab4c8
New REST API Explorer branding and improvements 
- Header of REST API Explorer has been Dolibarr colored
- API Methods are now sorted alphabetically
- API endpoints with same names are now sorted in this order (GET, POST, PUT, PATCH, DELETE)
 2018-08-26 17:13:19 +02:00
Laurent Destailleur
988b6a49d2 Fix warning php 7.3 2018-07-13 18:40:54 +02:00
Laurent Destailleur
fb8dd2f32b FIX TCPDF is generated PDF 1.7 but TCPDI was setting version to 1.3 2018-06-08 09:37:26 +02:00
Laurent Destailleur
1f775c907d Fix translation of % column in gantt view 2018-05-04 11:01:22 +02:00
Laurent Destailleur
3eee68c404 NEW Prototype of a module DAV 2018-03-27 16:18:12 +02:00
Laurent Destailleur
b756c4a51e Upgrade to tcpdf 6.2.17 2018-03-25 19:42:34 +02:00
Laurent Destailleur
5fae930f85 Fix warnings 2018-03-25 19:22:08 +02:00
Laurent Destailleur
73273f68b3 Prepare lib to be a native class 2018-03-25 19:21:00 +02:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Laurent Destailleur
8c03fdd51f NEW Upgrade of Stripe lib to 6.4.1 2018-03-07 19:26:06 +01:00
Laurent Destailleur
b9f1695b34 NEW Upgrade of Stripe lib to 6.4.1 2018-03-07 19:25:05 +01:00
Laurent Destailleur
3ebf01e0c6
Update .travis.yml 2018-03-07 13:21:07 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
ptibogxiv
613e92e5e8
update stripe php 2018-03-06 13:52:56 +01:00
ptibogxiv
f35606e434
FIX update stripe php librairy 2018-03-06 13:50:42 +01:00
Gerhard Stephan
520f581481 Don't check for windows/linux, just call soffice (without the extension) will work on windows too. 2018-02-15 14:38:21 +01:00
Laurent Destailleur
9965a25eaa Code comment 2018-02-15 13:23:13 +01:00
Laurent Destailleur
0172ecb425 Code comment 2018-02-15 13:21:58 +01:00
Laurent Destailleur
d547d1a9cf Suggest better change for #8196. To be tested. 2018-02-15 13:16:54 +01:00
Gerhard Stephan
51028c845d Export to PDF using LibreOffice 5 command line 2018-02-15 10:15:27 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer 2018-01-25 22:03:51 +01:00
Frédéric FRANCE
a34b99f3ec
swiftmailer 2018-01-21 15:55:56 +01:00
Laurent Destailleur
fb8326a9bb Css use roboto but files does not exists 2017-12-22 12:56:29 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
 2017-12-20 13:28:41 +01:00
Laurent Destailleur
ca8ae3c723 Fix option MAIN_USE_JQUERY_JEDITABLE 2017-12-20 13:17:21 +01:00
Laurent Destailleur
394eeb3cd9 Fix rendering MD files of images by adding a css 2017-12-16 15:11:40 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
61798d1af0 FIX list of module not complete when module mb_strlen not available 
Conflicts:
	dev/dolibarr_changes.txt
 2017-11-25 02:34:24 +01:00
Laurent Destailleur
bdecef56f9 FIX list of module not complete when module mb_strlen not available 2017-11-25 02:32:25 +01:00
Laurent Destailleur
62da0160e1
Merge pull request #7780 from fappels/develop_update_tablednd 
FIX #3551 and #6823 table drag and drop not working.
 2017-11-22 11:22:14 +01:00
fappels
8d318337d9 Check hound barking 2017-11-20 14:56:12 +01:00
fappels
37caa28e7e Update tablednd to v1.0 RC 2017-11-20 10:25:02 +01:00
Laurent Destailleur
bbf755f0b1 Fix for PHP7.2 2017-11-17 18:20:24 +01:00
Laurent Destailleur
776f999b71
Merge branch 'develop' into develop_update_tablednd 2017-11-17 15:10:09 +01:00
Laurent Destailleur
f33b5067ad Upgrade branch 3.0 of RESTLER (still 3.0.0 RC6) 
This upgrade Swagger from 1.2 to 2.0
 2017-11-17 12:55:27 +01:00
fappels
6ef72a033b Update tablednd jquery plugin to latest git master 2017-11-07 16:15:59 +01:00
Laurent Destailleur
5df4912324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2017-11-02 09:45:13 +01:00
Laurent Destailleur
3db101ffdd Clean packager 2017-10-31 01:06:07 +01:00
Laurent Destailleur
82b333e423 Fix migration to select2 4.0.5 2017-10-26 14:06:23 +02:00
Laurent Destailleur
f4f47c6732 NEW Remove tooltip tipTip library replaced with standatd jquery tooltip 2017-10-22 21:15:08 +02:00
Laurent Destailleur
475db3172a NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
Laurent Destailleur
dbcf3ddbe8 NEW Upgrade jquery select2 to 4.0.4 2017-10-21 19:05:24 +02:00
Laurent Destailleur
a16f0e4356 NEW The gantt diagram is now sensitive to hours 
NEW Add a group task line for tasks on same level on gantt diagram
 2017-10-20 04:15:44 +02:00
Laurent Destailleur
a818422302 Update jsgantt to 1.7.5.4 2017-10-18 21:24:17 +02:00
Laurent Destailleur
d404d8be9f Debug to make MAIN_ODT_AS_PDF workign with unoconv 2017-10-10 18:54:30 +02:00
Laurent Destailleur
5980651103 Merge branch 'develop' into develop 2017-09-21 11:41:30 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
aba907d1a8 FIX #7420 2017-09-18 15:49:21 +02:00
Laurent Destailleur
2d7916f77d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/json.lib.php
 2017-09-14 11:49:02 +02:00
Laurent Destailleur
7d5dc08a0a Fix PHP7.2 2017-09-14 11:47:27 +02:00
Laurent Destailleur
e2ccac68c5 Fix PHP7.2 2017-09-08 14:45:11 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
ae7f2ac253 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 20:21:35 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Laurent Destailleur
25f9d782dc NEW Add non intrusive js library to make syntaxic coloring of textarea 2017-07-12 12:30:07 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
mikee2
6a35047020 Updated to use dolibarr timme functions 
Redefined macro strings to adapt to dolibarr date functions return values. Keep same macro names when possible to avoid breaking existing code. Some macro holders (not commonly used) have been dropped because non existing values in dolibarr date functions.

Per eldy request changed php date functions with dolibarr's internal date functions to match users time zone. Now dates are those of the user's timezone so check that is is correctly defined in user's profile.
 2017-06-14 12:53:29 +02:00
Laurent Destailleur
f011197e00 Update swagger to 2.0.24 2017-05-24 15:12:45 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
mikee2
637e1a8d21 Update Segment.php 
Add additional needed fields so that you can invoice yearly items. Have number and text descriptions to avoid future changes that may break existing invoices.
 2017-05-06 10:49:37 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
bb47c69283 Merge pull request #6685 from mikee2/develop 
Add macro replacement to ODT invoice lines
 2017-04-29 21:20:19 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Laurent Destailleur
05fe0d7fcd Fix doxygen 2017-04-29 01:01:12 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
af56c85057 Fix perms on file 2017-04-24 03:11:19 +02:00
Alexandre SPANGARO
d0e27f67e7 Add plugins Stripe 2017-04-18 05:44:08 +02:00
mikee2
e6b20840a3 Update Segment.php 2017-04-14 11:49:30 +02:00
mikee2
f460d2e705 Update Segment.php 2017-04-09 21:39:15 +02:00
fappels
527fa27fb7 Add jquery-migrate to handle jquery 3.0 removes 2017-03-29 11:18:03 +02:00
Laurent Destailleur
a5c11dc840 NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
Laurent Destailleur
0b69d0143b Try jSignature 2017-03-03 15:26:51 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
559478048c Move resources for theme at a batter place 2017-02-24 14:38:20 +01:00
Laurent Destailleur
f75af2af37 Close #6146 - Let's experiment fontawesome. 2017-02-24 14:37:18 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Laurent Destailleur
49d0deea39 NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12 2017-02-23 00:46:19 +01:00
Laurent Destailleur
fbecb1b2d8 Work on removal of jmobile 2017-02-23 00:45:27 +01:00
Laurent Destailleur
64721d73b6 Remove not so usefull plugin jquery layout (prepare js upgrades) 2017-02-22 19:36:57 +01:00
Laurent Destailleur
bab4f5c185 Removed useless library FPDFI. 2017-02-22 18:00:34 +01:00
Laurent Destailleur
bc43a052f4 Default usage to send token is header. 2017-02-03 12:16:13 +01:00
Laurent Destailleur
db220e7af5 FIX Rename api_key into DOLAPIKEY to allow to use it on http header. 2017-01-22 20:55:26 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not 
received.
 2017-01-17 20:05:10 +01:00
Laurent Destailleur
9cfc8d4095 Fix several problems into OAuth2 module. 2017-01-06 19:58:46 +01:00
Laurent Destailleur
1082997f62 FIX #5972 #5734 2016-11-11 15:19:25 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
7ceb3cb62a FIX Avoid error 500 if phpexcel is disabled 2016-10-22 16:53:22 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
03ebe769d7 Clean sources from not used libraries. 2016-10-05 00:38:17 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
828fe984e8 FIX #5734 2016-09-12 00:09:46 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
9fabfe029b Remove debug logs 2016-07-29 16:31:29 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
2866d60240 Revert "change jsgantt to jsGanttImproved" 
This reverts commit caf963351b.
 2016-07-26 13:59:08 +02:00
Sergio Sanchis Climent
71d153c4e2 change jsgantt to jsGanttImproved 2016-07-26 13:56:34 +02:00
Sergio Sanchis Climent
caf963351b change jsgantt to jsGanttImproved 2016-07-26 01:59:27 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
 2016-07-16 19:54:57 +02:00
Laurent Destailleur
931531232c FIX duplicate jquery.js files 2016-07-16 19:38:18 +02:00
Laurent Destailleur
6f489c1fbd FIX Missing original .js file (license violation if sources are not 
provided)
 2016-07-16 19:19:52 +02:00
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