Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
124,585 Commits 36 Branches 190 Tags
94e93aea05f58a7511345d97215b94764da81ac2
Commit Graph

3440 Commits

Author SHA1 Message Date
Laurent Destailleur
94e93aea05 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-29 13:32:47 +02:00
ksar
3df149045d FIX : Display the date according to user language on subsitutions (#29510) 
See : https://www.dolibarr.fr/forum/t/format-date-dune-variable-de-substitution-dans-un-modele-de-courriel/40705
 2024-04-28 01:17:09 +02:00
Laurent Destailleur
2ed6ae0799 Fix #29031 Fix #29059 2024-03-31 19:15:41 +02:00
Laurent Destailleur
2d9801ffe3 Fix sec more complete list of forbidden function 2024-03-06 17:18:46 +01:00
Laurent Destailleur
17ff0972ab Fix use of invoke into computed fields 2024-03-03 19:35:37 +01:00
Laurent Destailleur
792606925f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2024-02-07 17:50:38 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/takepos/invoice.php
 2024-02-07 17:44:39 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Laurent Destailleur
9a6ae3c454 FIX Return a better error message when token is not valid 2023-12-21 19:25:07 +01:00
Laurent Destailleur
c1aefa75a7 FIX delivery note disappear after generation 2023-11-20 21:49:25 +01:00
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
Eric
337fa2ac67 add category map to categorie (#26649) 2023-11-17 03:44:15 +01:00
Laurent Destailleur
061f340f90 Debug v19 2023-11-13 15:20:56 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
Laurent Destailleur
201ad75360 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
 2023-11-12 23:02:18 +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
Laurent Destailleur
f9d520b29d Fix warning 2023-11-05 18:27:53 +01:00
Laurent Destailleur
8abde02b85 FIX dol_eval with function starting with ! 2023-10-18 16:26:27 +02:00
Laurent Destailleur
6311200b36 FIX #26170 2023-10-12 14:31:54 +02: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
Regis Houssin
6e27a6517a FIX avoid excess line breaks 2023-10-01 03:20:37 +02:00
Regis Houssin
c616251b61 FIX missing 'overwrite_trans' for $addzero (Multicompany) 2023-09-28 07:09:21 +02:00
Laurent Destailleur
691d5418e5 Code comment 2023-09-18 18:08:06 +02:00
Laurent Destailleur
9923331ac1 Better backward compatibility of modules 2023-09-16 14:16:31 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +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
0c588ccd60 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:09 +02:00
Laurent Destailleur
3073a98563 Fix creation of subdir for website 2023-09-08 01:28:11 +02:00
Laurent Destailleur
36c1c6be6a Fix test on entity for project 2023-09-05 16:33:37 +02:00
Laurent Destailleur
81e96f8787 Fix remove warnings 2023-08-14 23:09:40 +02:00
Laurent Destailleur
310ef11dac FIX WAF 2023-08-13 15:45:45 +02:00
Laurent Destailleur
504928aa90 Debug v18 - Fix status of user when expired 2023-08-12 17:04:38 +02:00
Laurent Destailleur
b47a640f0b Debug v18 2023-08-05 12:37:25 +02:00
Laurent Destailleur
1e443e060c Debug v18 2023-07-22 16:17:06 +02:00
Laurent Destailleur
5e41023862 Debug v18 2023-07-19 22:58:11 +02:00
Laurent Destailleur
8f9ee9eb35 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/societe/class/societe.class.php
 2023-07-19 02:03:34 +02:00
Laurent Destailleur
9b5264a4fd FIX CVE reported by BELABED Skander (Akerva) 2023-07-12 21:45:42 +02:00
Laurent Destailleur
d4cda09794 Debug v18 2023-07-10 02:25:33 +02:00
Laurent Destailleur
723ec550a7 Merge pull request #25276 from BB2A-Anthony/FIX---No-spam-label-if-nbrec-is-empty 
FIX - No spam label if nbrec is empty
 2023-07-05 19:17:33 +02:00
Anthony Berton
7f1fad24c1 FIX - No spam label if nbrec is empty 2023-07-05 12:16:35 +02:00
Laurent Destailleur
af1b15eba5 Debug v18 2023-07-02 16:51:18 +02:00
Laurent Destailleur
763fcc4a67 Var not used 2023-06-30 11:07:13 +02:00
Laurent Destailleur
a3e4d8fe3a Debug v18 2023-06-29 16:30:34 +02:00