Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
88,057 Commits 36 Branches 189 Tags
080ffa6a51a3771b1d95f36da28d312f429b04c0
Commit Graph

4278 Commits

Author SHA1 Message Date
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
Laurent Destailleur
c97fcaec87 Better fix select2 bug https://github.com/select2/select2/issues/5832 2020-12-17 21:41:39 +01: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
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
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
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
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
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