lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,364 Commits 43 Branches 150 Tags 886 MiB
3e0689879d
Commit Graph

4421 Commits

Author SHA1 Message Date
Laurent Destailleur
69344a7170 Fix create temp dir 2021-01-26 16:33:47 +01:00
Laurent Destailleur
8bc639fe02 Fix too many logs 2021-01-26 16:10:27 +01:00
Laurent Destailleur
5660159a6d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:13:26 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
ptibogxiv
984c355f39 update stripe-php 7.67.0 2021-01-03 23:37:44 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Regis Houssin
325c2b03f8 FIX step by step 2020-12-29 17:02:35 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
5aae018a0b Fix for php8 2020-12-27 19:33:07 +01:00
Laurent Destailleur
93d309cdbc FIX Update Restler API to 3.1.1 to fix error with php8 2020-12-23 19:15:58 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
c97fcaec87 Better fix select2 bug https://github.com/select2/select2/issues/5832 2020-12-17 21:41:39 +01:00
Laurent Destailleur
506659a9d2 Update jsGant lib to 2.7.3 2020-12-15 03:56:08 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
5f476e7e7e Compatibility of nusoap with PHP8 2020-12-12 15:37:15 +01:00
Laurent Destailleur
85bb3fa909 Update chart.js to 2.9.4 2020-12-07 21:57:29 +01:00
Laurent Destailleur
796fe5cd8a Update .gitignore 2020-12-07 21:47:57 +01:00
Laurent Destailleur
4bc2e791a8 Update .gitignore 2020-12-07 21:44:19 +01:00
Laurent Destailleur
f738c875d8 Update gitignore 2020-12-07 21:10:10 +01:00
Laurent Destailleur
644bac0b80 Removed gitignore 2020-12-07 20:39:59 +01:00
Laurent Destailleur
bb217db31e Ad .gitignore 2020-12-07 20:38:15 +01:00
Laurent Destailleur
d5b009a22a Add .gitignore 2020-12-07 20:36:42 +01:00
Laurent Destailleur
af040dd675 Update lib 2020-12-07 20:33:13 +01:00
Laurent Destailleur
078e395bfb Fix gitignore 2020-12-07 20:25:54 +01:00
Laurent Destailleur
8fecae7148 Update pclzip to 2.8.4 (compatible with php 8) 2020-11-01 22:49:28 +01:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Rüdiger Hahn
3b7b4312cb
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 11:13:11 +02:00
Rüdiger Hahn
5510f1feef
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 10:59:06 +02:00
Laurent Destailleur
14e6d38fe8
Merge pull request #14860 from Tim-Otte/fix-missing-styles-in-lines 
FIX: Added support for styling in lines in odt documents
 2020-09-29 14:11:25 +02:00
Tim Otte
4611333ee6 Added support for styling in lines 2020-09-29 12:17:25 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level) 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc FIX Restore multiselect (selection of prospect level) 2020-09-21 12:16:22 +02:00
Laurent Destailleur
f55ad8a51c
Merge pull request #14767 from Tim-Otte/fix-missing-hash-in-html-to-odt-converter 
FIX: HTML to ODT converter
 2020-09-17 23:07:10 +02:00
Tim Otte
f5c0cd25e2 Fixed html to odt converter 2020-09-17 13:19:31 +02:00
Nicolas
ee4e209e7c NEW Oauth SCOPE for Admin SDK 2020-09-14 15:12:57 +02:00
Laurent Destailleur
f567d41055 Fix php8 2020-09-08 05:16:37 +02:00
Laurent Destailleur
198b8d8d2b debugbar ok with php5.6 2020-09-08 02:59:49 +02:00
Laurent Destailleur
b5376d3322 Upgrade lib for phpdebugbar 2020-09-07 21:18:26 +02:00
Laurent Destailleur
c95e54843c Update lib debugbar 
Update php-parallel-lint
 2020-09-07 21:00:40 +02:00
Laurent Destailleur
b6e537a7e5 phpcs 2020-09-07 19:09:19 +02:00
Laurent Destailleur
de2f97ab4e Update gitignore 2020-09-07 19:01:04 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
Laurent Destailleur
38d53cc03d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-23 19:20:50 +02:00
Frédéric FRANCE
b4d2bf98fa
Use of undefined constant state - assumed 'state' 2020-08-20 12:14:40 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2020-07-29 13:53:09 +02:00
Laurent Destailleur
377e331e6a
Merge pull request #14288 from atm-florianm/FIX_11.0_debugbar_body_bottom_margin_offset 
FIX 11.0: DebugBar hides content at page bottom
 2020-07-29 13:10:56 +02:00
Laurent Destailleur
988e9e5817 Update to jquery 3.5.1 2020-07-27 13:52:19 +02:00
FlorianMortgat
93348630bf FIX 11.0: computation of the bottom margin of <body> returns NaN because body is not loaded yet 2020-07-25 11:05:05 +02:00
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive 
Restore some files modified by error.
 2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867 Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive) 2020-04-18 14:39:02 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of 
DOL_DOCUMENT_DIR.
 2020-04-15 20:00:27 +02:00
Laurent Destailleur
9f55918cb8 Remove Geoipv1 library. We use now v2 2020-04-02 12:37:21 +02:00
Laurent Destailleur
b8eaf8dd03 Removed jflot js library (we now use ChartJS) 2020-04-02 12:29:15 +02:00
andreubisquerra
493e07a14e
Log CUPS print error on Receipt Printer module 
Important help to debug errors on CUPS printing
 2020-03-30 19:32:23 +02:00
Laurent Destailleur
f12881b3f8
Merge pull request #13360 from dolibit-ut/patch-20 
create README.txt
 2020-03-18 18:29:26 +01:00
Laurent Destailleur
5c881ee1d4
Merge pull request #13361 from dolibit-ut/patch-21 
Create README.txt
 2020-03-18 18:28:37 +01:00
Laurent Destailleur
1c76abb748
Merge pull request #13363 from dolibit-ut/patch-23 
update https
 2020-03-18 18:25:54 +01:00
Laurent Destailleur
11f2f12990
Merge pull request #13365 from dolibit-ut/patch-24 
Update adodb-time.inc.php
 2020-03-18 18:23:09 +01:00
UT from dolibit
97639c4648
Create README.txt 2020-03-16 15:41:54 +01:00
UT from dolibit
58aa06b584
Update adodb-time.inc.php 
See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index 
Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php
 2020-03-16 15:39:08 +01:00
UT from dolibit
5b1e8c4ebd
Update tcpdi.php 2020-03-16 14:44:26 +01:00
UT from dolibit
a8024b652c
Create README.txt 2020-03-16 14:31:09 +01:00
UT from dolibit
c8446662bf
create README.txt 2020-03-16 14:25:20 +01:00
Laurent Destailleur
68f14ef483 Fix missing js 2020-03-13 09:37:26 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
94589158c0 Move class from external project as internal class (project is dead) 2020-03-13 02:32:33 +01:00
Laurent Destailleur
f07d228537 Upgrade mobiledetect from 2.8.33 to 2.8.34 2020-03-13 02:28:01 +01:00
Laurent Destailleur
fede6da5cf Move Chartjs into correct dir name 2020-03-13 02:17:15 +01:00
Laurent Destailleur
36e6dd9d8e
Merge pull request #13254 from Tim-Otte/add-odt-converter 
NEW Support some HTML contents into ODT documents
 2020-03-11 16:49:39 +01:00
Tim Otte
26deae9dbc Fixed the regex string used to extract the attributes from the html tag 2020-03-09 15:37:23 +01:00
Laurent Destailleur
722777d348 Add lib 2020-03-06 10:34:14 +01:00
Tim Otte
1472a24371 Added missing line break replacement when the values do not contain html tags 2020-03-05 09:41:22 +01:00
Laurent Destailleur
d0839350db NEW Move engine to build charts from jflot to chart.js 2020-03-04 23:30:41 +01:00
Laurent Destailleur
47d13a27df NEW Upgrade ace to 1.4.8 - Upgrade select2 to 4.0.13 2020-03-04 11:43:48 +01:00
Tim Otte
6b3fdfbcd8 Moved the HtmlToOdtConverter class into the odf class 2020-03-04 08:54:49 +01:00
Laurent Destailleur
1ee52d4c63 Enhancement of #13240 2020-03-03 23:19:05 +01:00
Tim Otte
8ce1f5f360 Fixed a few bugs 
Added custom font-families
 2020-03-03 10:19:05 +01:00
Tim Otte
d5671f1c42 Fixed a few bugs 2020-03-02 16:08:06 +01:00
Tim Otte
598d6d63b0 Added HtmlToOdtConverter class 
Implemented the converter in the odf setVars() function
 2020-03-02 10:18:38 +01:00
Alex Ludwig
6ad477a08c
Resolve Error if dolibarr is running in docker container 
If dolibarr is running in docker containers with alpine-linux it will fail because it has wrong environment variables. This pull request resolve the issue. It was found by dolichicken in the german user forum: https://www.dolibarr.de/forum/howto-hilfe/52509-anleitung-odt-nach-pdf-konvertieren#57583
 2020-03-01 17:14:31 +01:00
Laurent Destailleur
ea19ab96c3 Fix compatibility with php 7.4 2020-02-21 14:46:02 +01:00
Laurent Destailleur
d3f8c7af1e Fix compatibility with php 7.4 2020-02-21 14:41:36 +01:00
Laurent Destailleur
2cb414e17e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 2020-02-03 06:35:27 +01:00
Laurent Destailleur
2813c9d4b4 FIX #12973 2020-02-03 06:31:40 +01:00
Laurent Destailleur
87f84e5b17 FIX #12973 2020-02-03 06:29:40 +01:00
Frédéric FRANCE
47ee03acdc Update odf.php 2020-01-10 00:26:46 +01:00
Laurent Destailleur
a0f1e76f93
Merge pull request #12556 from TobiasSekan/FixCantCreateFiles 
Fix can't create files on shared folder (Windows)
 2019-12-01 18:56:20 +01:00
Laurent Destailleur
958ffa6ec8 FIX Images in TCPDF are removed by TCPDF when it should not 2019-11-30 17:19:25 +01:00
Tobias Sekan
f304dd424b
Fix can't create files on shared folder (Windows) 2019-11-29 07:46:39 +01:00
Laurent Destailleur
00ad95c01e Figth against useless dependencies: Remove library the core never use. 2019-11-22 14:06:43 +01:00
Frédéric FRANCE
430be760f3
restore files modified by stickler 2019-11-03 17:13:27 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module 2019-11-03 12:57:06 +01:00
stickler-ci
c2d66a9e64 Fixing style errors. 2019-11-02 23:53:11 +00:00
Frédéric FRANCE
6cb5f28db1
wip ticket printer 2019-11-02 21:16:59 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer 2019-11-02 21:15:48 +01:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
6d2a714d42 Fix dos2unix files 2019-10-10 10:55:29 +02:00
Laurent Destailleur
0cf014b01f Update Restler to 3.0RC6 (last bug fixes of branch v3) 2019-10-08 11:14:53 +02:00
Laurent Destailleur
cf3c69ce0f Patch 2019-10-08 10:29:06 +02:00
Laurent Destailleur
e60b281361 Fix missing dolibarr patch 2019-10-08 10:20:25 +02:00
Laurent Destailleur
485fa697d3 Restore original official files 2019-10-08 10:18:59 +02:00
Laurent Destailleur
44025ce4c2 Update TCPDF to 6.3.2 2019-10-08 09:59:17 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
1439310a15 Fix margin 2019-09-12 21:08:46 +02:00
Laurent Destailleur
4ecbc1719f Update ckeditor 4.12 2019-09-10 17:57:31 +02:00
Laurent Destailleur
d2b2cc010b Update ckeditor 4.12 2019-09-10 17:50:55 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
f5aede8256 NEW GeoIP v2 support is natively provided. 2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Frédéric FRANCE
9e88433706
add intval to evalmath class 2019-08-07 12:59:27 +02:00
Laurent Destailleur
ac715b5147 Upgrade Stripe lib to 6.41 to support SetupIntent 2019-08-01 12:53:17 +02:00
Laurent Destailleur
ea349de081 FIX #11498 2019-07-15 23:25:42 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
f2e03b3909 Removed useless files (replaced with DebugBar) 2019-05-26 11:24:57 +02:00
Laurent Destailleur
fa5c5a3336 Update Stripe API to 6.35 2019-05-16 21:41:14 +02:00
Laurent Destailleur
b63803e8ef Fix missing dir 2019-05-13 20:42:09 +02:00
Laurent Destailleur
f576d441bc FIX #11171 
Upgrade Mobile_Detect. This
 2019-05-13 19:53:04 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
3c90461502 Better error message in convert odt to pdf 2019-04-27 17:31:14 +02:00
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