Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
102,972 Commits 36 Branches 189 Tags
0c52817426af4b82b51a06101dfc83f2c5e0855a
Commit Graph

25432 Commits

Author SHA1 Message Date
Laurent Destailleur
ff94c60cc7 Fix GETPOST with restricthtml 2021-07-07 01:45:31 +02:00
Laurent Destailleur
f286017cab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 19:03:55 +02:00
Laurent Destailleur
f761a2d3b8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Florian Mortgat
9f7be989c2 FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter() 2021-07-06 17:38:37 +02:00
Laurent Destailleur
5444d45e68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8 Fix phpunit 2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877 Fix function not found 2021-07-06 15:55:43 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Laurent Destailleur
1cfa43c085 Merge pull request #18088 from aspangaro/14p1 
FIX Accountancy - Link from admin
 2021-07-06 14:48:26 +02:00
Laurent Destailleur
555f1c719b Debug v14 2021-07-06 04:29:25 +02:00
Laurent Destailleur
61ed899608 Fix set discount on line in TakePos 2021-07-06 03:53:42 +02:00
Laurent Destailleur
c901e518a7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 02:11:28 +02:00
Laurent Destailleur
3dff7e29cc Fix #yogosha6567 2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML 2021-07-06 00:47:43 +02:00
Laurent Destailleur
2a5699a9a2 Merge 2021-07-05 23:07:40 +02:00
Laurent Destailleur
f8eadf6fe1 Fix #yogosha6561 2021-07-05 22:42:48 +02:00
Laurent Destailleur
db95339085 Code comment 2021-07-05 20:32:05 +02:00
Laurent Destailleur
a04ed363c7 Look and feel v14 2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146 css 2021-07-05 18:56:24 +02:00
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
65adb16191 Fix increase entrophy of default password generation. 2021-07-05 17:55:17 +02:00
Laurent Destailleur
f648185839 Fix phpcs 2021-07-05 17:34:25 +02:00
Laurent Destailleur
c0118c7de2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-05 17:08:27 +02:00
Laurent Destailleur
d414bcb572 Fix phpcs 2021-07-05 17:08:10 +02:00
Laurent Destailleur
fe5c4f4a0e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 17:04:38 +02:00
Laurent Destailleur
8b07e99e05 Fix for ' inserted by CKEditor instead of ' 2021-07-05 16:08:47 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
b7c86f3aec Fix ldap 2021-07-05 11:41:55 +02:00
Alexandre SPANGARO
8bde61c2c6 FIX Accountancy - Link from admin 2021-07-05 06:58:10 +02:00
ATM john
752fe22c68 Add simple auto mode 2021-07-04 23:24:38 +02:00
ATM john
a709cc583f Add modal option to btn 2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
d1c6a9899c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-03 18:33:00 +02:00
Laurent Destailleur
30f9eb9f23 Fix phpcs 2021-07-03 18:32:52 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
b43fddfc74 Merge pull request #18058 from altairisfr/exportprices 
add labels and export only latest prices
 2021-07-02 16:35:58 +02:00
Laurent Destailleur
dbd2d2eb20 Merge pull request #18069 from marc-dll/13.0_FIX_holiday_menus 
FIX: holiday: status filter parameter has been renamed but not in links it was used
 2021-07-02 16:35:14 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
John BOTELLA
167ae5b0f2 Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Marc de Lima Lucio
97938f489e FIX: holiday: status filter parameter has been renamed but not in links it was used 2021-07-02 11:35:26 +02:00
Théo David
079608fe00 NEW #18046 Add ticket ticket categories functions 2021-07-02 10:26:03 +02:00
Frédéric FRANCE
3aa24cccff fix can't remove extrafield date or datetime value 2021-07-01 15:15:35 +02:00
Laurent Destailleur
9392624e54 Fix deletion of line on replacement invoice 2021-07-01 13:36:04 +02:00