Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

9275 Commits

Author SHA1 Message Date
atm-jonathan
48ba0ec2d0 FIX warning param $lineID getSpecialCode is negatif (#26826) 
* FIX warning param $lineID getSpecialCode is negatif

* retour de PR

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-23 17:12:57 +01:00
atm-jonathan
253ebd0a8b FIX warning php8.2 undefined_array_key (#26830) 2023-11-23 17:08:07 +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
Maxime Kohlhaas
ef1916f0db Fix : translated product desc was overwriting desc even if text was added after (#26687) 2023-11-18 14:15:34 +01:00
Laurent Destailleur
1b91a9f83b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-18 01:24:59 +01:00
Maxime Kohlhaas
a680d1e34d Fix strpos inversion for expedition and receipt in files.lib (#26701) 2023-11-18 00:42:15 +01:00
Maxime Kohlhaas
de0b733430 Fix : missing getEntity for hrm public holiday (#26627) 2023-11-16 23:27:20 +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
51574768f4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-11-05 19:40:07 +01:00
Laurent Destailleur
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
HENRY Florian
7e3b098f78 fix: when option MAIN_USE_COMPANY_NAME_OF_CONTACT is set the VAT num have to be the VAT num of thirdparty of contact (#26371) 2023-10-26 12:28:00 +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
Laurent Destailleur
2a96ac6428 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 13:02:09 +02:00
Laurent Destailleur
342cdc81ac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777 css 2023-10-04 12:59:00 +02:00
Laurent Destailleur
a2ea4d77c3 Merge 2023-10-04 10:43:14 +02:00
Laurent Destailleur
0a015a82b4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 10:39:40 +02:00
Laurent Destailleur
9ac5270626 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f Fix regression 2023-10-04 10:36:07 +02:00
Laurent Destailleur
f6f25e1117 Fix regression 2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f Fix regression 2023-10-04 10:33:38 +02:00
Laurent Destailleur
726258ff4f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:32:24 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
74f486bd60 Merge pull request #26034 from atm-quentin/FIX_rights_paiement_sc 
FIX rights paymentsc paiementcharge
 2023-10-04 09:47:49 +02:00
Eric Seigne
563cdcefb3 fix #26104 : remove global object 2023-10-04 00:10:19 +02:00
Laurent Destailleur
5e76fea64d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-01 15:50:25 +02:00
Laurent Destailleur
b0b3d0e1e0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-01 15:43:40 +02:00
Quentin VIAL-GOUTEYRON
f4c6beac74 FIX rights paymentsc paiementcharge 2023-09-26 14:54:15 +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
e2de78d9b4 Fix permission on recurring invoice 2023-09-05 19:13:51 +02:00
Laurent Destailleur
cd960d30df Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-27 16:01:05 +02:00
Laurent Destailleur
4302a6bc04 Fix empty on getDolGlobal 2023-08-27 15:55:44 +02:00
Laurent Destailleur
9b16c56074 Fix warning 2023-08-26 10:05:33 +02:00
am97
954c54ad3f Fix SQL syntax error (#25562) 
Single quotes are needed to indicate that 'project' and 'external' are strings, otherwise the requests fail
 2023-08-09 12:50:14 +02:00
Laurent Destailleur
6d64026b93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-19 01:52:19 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2023-07-19 01:50:18 +02:00
atm-gauthier
88a8bcdb22 FIX : We should always be able to filter on action type no matter if we can't read actions of others (#24462) 2023-07-16 12:14:18 +02:00
atm-steve
b307ecea40 FIX display project tasks list columns (#24557) 
* fix: display columns

* fix fix

* fix: IDE
 2023-07-16 12:02:14 +02:00
Laurent Destailleur
9b5264a4fd FIX CVE reported by BELABED Skander (Akerva) 2023-07-12 21:45:42 +02:00
Laurent Destailleur
41202adca8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-19 19:25:08 +02:00
ATM-NicolasV
552da3b0cb Merge branch '17.0' into fix_expedition 2023-06-19 14:12:30 +02:00
ATM-NicolasV
8f0e6ac3f6 Change strpos for expedition and receipt in files.lib and inversion 2023-06-19 14:10:45 +02:00
Laurent Destailleur
bbc66299ba FIX Delete of bank of a thirdparty must need the edit thirdparty perm 2023-06-17 01:04:15 +02:00