Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,804 Commits 36 Branches 189 Tags
86971c7b863c1b891c30f901b5ed3751eeaa720d
Commit Graph

3193 Commits

Author SHA1 Message Date
Laurent Destailleur
d1a80920ff Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-20 19:53:50 +01:00
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/product/stock/stockatdate.php
 2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
lvessiller-opendsi
785c85205b FIX substitute project variables in invoice documents (#26445) 
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
 2023-11-08 17:32:23 +01:00
Laurent Destailleur
1a2e49cebe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-05 19:45:42 +01:00
Laurent Destailleur
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
 2023-10-04 17:48:30 +02:00
Laurent Destailleur
9923331ac1 Better backward compatibility of modules 2023-09-16 14:16:31 +02:00
Laurent Destailleur
7819b9586d Exclude more exec functions 2023-09-08 04:28:09 +02:00
Laurent Destailleur
32837761b5 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:57 +02:00
Laurent Destailleur
9b5264a4fd FIX CVE reported by BELABED Skander (Akerva) 2023-07-12 21:45:42 +02:00
Noé Courtier
6102139531 Fix: remove unwanted var_dump() 2023-06-09 15:43:19 +02:00
Laurent Destailleur
76de309cd9 FIX error management on emoji and utf8 validity by emailcollector 2023-05-17 14:23:14 +02:00
Laurent Destailleur
2f6b95c073 FIX Sending email from attendee list 2023-05-11 18:42:56 +02:00
Philippe GRAND
110393c89e fix : Typo issue 2023-04-24 10:56:24 +02:00
Laurent Destailleur
fbe8e2731d Fix escapment 2023-04-13 12:58:06 +02:00
Laurent Destailleur
45fb3d9bbe FIX Search when criteria start with ! 2023-04-08 12:11:00 +02:00
Laurent Destailleur
0df02e3141 Fix var no defined 2023-04-05 15:59:40 +02:00
Laurent Destailleur
bb2bb638e6 FIX Filter on member status 2023-04-05 03:27:21 +02:00
priojk
63b0e65797 adjusted fix 2023-03-28 23:05:29 +02:00
priojk
99cb5098e7 extend preg match to alternative action names 2023-03-28 17:25:07 +02:00
Laurent Destailleur
a0098c39ab Merge pull request #24162 from atm-lena/17.0_FIX_textishtmlfunction 
FIX dol_textishtml() function
 2023-03-27 08:29:33 +02:00
Laurent Destailleur
af945c1901 Update functions.lib.php 2023-03-26 18:15:32 +02:00
atm-lena
e68076b8f1 Add better protect 2023-03-21 13:34:22 +01:00
Laurent Destailleur
9ddb7b6198 Debug v17 2023-03-20 12:00:21 +01:00
Laurent Destailleur
51bf3f0686 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-19 19:14:44 +01:00
Laurent Destailleur
9a192e443e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-19 19:05:47 +01:00
Laurent Destailleur
249a6ea9a9 Remove warning 2023-03-19 14:49:54 +01:00
Laurent Destailleur
d3f679f2b1 Fix sql regression 2023-03-19 12:54:11 +01:00
Laurent Destailleur
502badad4b Better error management 2023-03-19 11:32:46 +01:00
Laurent Destailleur
6e17c0c961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-18 10:51:07 +01:00
Laurent Destailleur
b81cb7e963 Merge pull request #24070 from Daviid-P/ignore_localtaxes_if_localtax_type_zero 
Ignore localtaxes if localtax1_type or localtax2_type is 0
 2023-03-18 10:48:23 +01:00
Laurent Destailleur
91cf865583 Update functions.lib.php 2023-03-18 10:41:07 +01:00
Laurent Destailleur
882857ce08 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-16 09:42:01 +01:00
David Pareja Rodriguez
927d0a2fa1 ORDER BY rowid 2023-03-13 11:16:37 +01:00
Laurent Destailleur
3300905599 Fix add a protection against bad param of dol_eval 2023-03-13 11:15:46 +01:00
Laurent Destailleur
80678cfcb9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-13 10:30:37 +01:00
Laurent Destailleur
ade0592a9b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:23:52 +01:00
noec764
353d451e5a Correct dolForgeCriteriaCallback 2023-03-10 15:48:26 +01:00
atm-lena
01e461546e FIX dol_textishtml() function 2023-03-08 14:28:43 +01:00
Laurent Destailleur
c235b5c5a0 Fix remove a bad error_log that was sending emails 2023-02-28 18:43:26 +01:00
David Pareja Rodriguez
590373a620 Forgot to loop on the results 2023-02-28 13:33:52 +01:00
David Pareja Rodriguez
b191330a79 Ignore localtaxes if localtax1_type or localtax2_type is 0 2023-02-28 13:24:11 +01:00
Laurent Destailleur
d97725173b Fix sql error 2023-02-26 12:45:13 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Laurent Destailleur
e5341c3b06 Merge pull request #24016 from atm-gauthier/fix_missing_w_option_in_dol_print_date 
FIX : missing w option in dol_print_date
 2023-02-23 20:27:28 +01:00
Laurent Destailleur
9216a6f870 FIX Bad value for phone in substitutions keys 2023-02-23 13:53:37 +01:00
Gauthier PC portable 024
30c76623e1 FIX : missing w option in dol_print_date 2023-02-23 10:46:20 +01:00
Marc de Lima Lucio
087af4f300 FIX: banner: status was not displayed if status field is not called 'status' + error if getLibStatut method not implemented 2023-02-22 12:26:56 +01:00