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
123,890 Commits 36 Branches 190 Tags
c1aefa75a74344f078c44df90c02e77f030497d1
Commit Graph

3429 Commits

Author SHA1 Message Date
Laurent Destailleur
c1aefa75a7 FIX delivery note disappear after generation 2023-11-20 21:49:25 +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
Laurent Destailleur
b4c448a420 Debug v18 2023-06-29 15:54:09 +02:00
Laurent Destailleur
a09c37514b css 2023-06-29 11:27:26 +02:00
Laurent Destailleur
d194ba099e Doc 2023-06-23 10:37:27 +02:00
Laurent Destailleur
1eeb4a75c6 Doc 2023-06-23 02:29:14 +02:00
Laurent Destailleur
db379ee40d Test CI 2023-06-19 15:00:15 +02:00
Laurent Destailleur
1ccd0e2e30 Test CI 2023-06-19 14:55:27 +02:00
Laurent Destailleur
92e3fc2fc9 Merge pull request #25090 from Hystepik/develop#1 
Fix : deprecated warnings on various pages
 2023-06-16 03:51:45 +02:00
Laurent Destailleur
392393b8c6 Merge pull request #25083 from frederic34/20230612 
use user hasRight
 2023-06-13 23:20:07 +02:00
Hystepik
e28de18a9b Fix : deprecated warnings on various pages 2023-06-13 16:01:52 +02:00
kkhelifa
b1f13ebf92 FIX: Add the hr balise to detect if the text is a html content 2023-06-13 14:24:30 +02:00
Frédéric France
0cb70110eb use user hasRight 2023-06-12 20:10:42 +02:00