Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur
35444e489d
Merge branch 'develop' into fix_notification_count 2024-03-18 23:42:24 +01:00
Laurent Destailleur
9ee6e6c170
Merge pull request #28944 from atm-john/17.0_backport_fix_23972
FIX : PDF Fatal error : Backport fix from  #23972
2024-03-18 23:42:06 +01:00
Laurent Destailleur
52205a407c
Merge branch 'develop' into massActionInSalary 2024-03-18 23:36:55 +01:00
Laurent Destailleur
a2090eae26
Merge pull request #28948 from frederic34/patch-9
Update codespell-dict.txt
2024-03-18 23:36:32 +01:00
Laurent Destailleur
2e2ade1b3a
Merge pull request #28915 from defrance/patch-321
Display additional boxes in all case
2024-03-18 23:36:01 +01:00
Laurent Destailleur
defd044a74 Fix phpunit 2024-03-18 23:34:08 +01:00
Jon Bendtsen
7e95fae8f7
Merge branch 'develop' into fix_notification_count 2024-03-18 23:29:15 +01:00
Laurent Destailleur
24ad3bb76b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2024-03-18 23:23:38 +01:00
Laurent Destailleur
557436a822
Merge pull request #28946 from MaximilienR-easya/develop_Add_substitution_intro_signature
New substitution for mail intro and signature on ticket mail
2024-03-18 23:20:33 +01:00
Jon Bendtsen
fce674e347 precommit check failed 2024-03-18 22:42:57 +01:00
Jon Bendtsen
1a35b20cb7 only counts notifications for existing contacts. SQL code copy from htdocs/societe/notify/card.php 2024-03-18 22:28:10 +01:00
Jon Bendtsen
f9797b82b4 the surrounding lines contained an ' as ' in the SQL statement, works both with and without, but this brings consistency 2024-03-18 22:25:29 +01:00
Frédéric France
03cda2dcc8 fix 2024-03-18 22:25:13 +01:00
Frédéric France
0cb5a082b5 Merge remote-tracking branch 'upstream/develop' into phpstanphpstan 2024-03-18 22:21:16 +01:00
Frédéric France
8e372094ac fix warning 2024-03-18 22:11:22 +01:00
Laurent Destailleur
01e6bd012e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-18 21:37:37 +01:00
Laurent Destailleur
08ed8f9aaf Fix trans 2024-03-18 20:53:59 +01:00
Laurent Destailleur
dfa9ed67d0 Fix warnings 2024-03-18 20:52:59 +01:00
Laurent Destailleur
ae41b07b70 Fix trans 2024-03-18 20:51:47 +01:00
Laurent Destailleur
1a82c5e8ce Fix warnings 2024-03-18 20:38:51 +01:00
Laurent Destailleur
adfa0dfa7f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-18 20:21:04 +01:00
Laurent Destailleur
a0b7cb90d8 FIX trackid and temp dir on payment confirmation of event registration 2024-03-18 20:17:19 +01:00
Laurent Destailleur
04ae0f776d FIX trackid and temp dir on payment confirmation of event registration 2024-03-18 20:02:08 +01:00
Frédéric France
38d178e708 Merge remote-tracking branch 'origin/phpstanphpstan' into phpstanphpstan 2024-03-18 19:53:19 +01:00
Laurent Destailleur
0b8d6dfae6 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-18 19:28:09 +01:00
Laurent Destailleur
62cf3ab098 Enhance error message 2024-03-18 19:27:52 +01:00
Frédéric France
d98b721071 fix phpstan 2024-03-18 18:42:09 +01:00
xbloq
b1758520ea
Update card.php #28938 2024-03-18 18:28:49 +01:00
Lamrani Abdel
244da63a1c NEW functionality for salaries with massactions 2024-03-18 18:22:19 +01:00
Laurent Destailleur
13f7012d40 NEW Add maintenance tool to switch utf8 -> utf8mb4 2024-03-18 18:17:53 +01:00
Frédéric France
eb8014c001 Merge remote-tracking branch 'upstream/develop' into phpstanphpstan 2024-03-18 17:50:42 +01:00
Laurent Destailleur
06ae1deb1b Fix better error message when using bad character_set_client 2024-03-18 17:27:06 +01:00
Frédéric FRANCE
a9cabe6fe4
Update codespell-dict.txt 2024-03-18 16:39:49 +01:00
mrozniecki
fcff03c66d Add substitution for mail intro and signature on ticket mail 2024-03-18 16:10:39 +01:00
Frédéric FRANCE
417ff90727
Merge branch 'develop' into phpstanphpstan 2024-03-18 16:04:37 +01:00
Laurent Destailleur
49bd37a72d Doc 2024-03-18 16:02:33 +01:00
Laurent Destailleur
57181e6407 Typo 2024-03-18 15:28:19 +01:00
John BOTELLA
715ce8b745 Backport #23972 2024-03-18 15:22:00 +01:00
Laurent Destailleur
bf01ddf101 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-18 15:16:17 +01:00
Laurent Destailleur
f9346a8022 Fix restore declaration to avoid to many uncompatibility problems. 2024-03-18 15:15:35 +01:00
Laurent Destailleur
20018163e2 Fix restore declaration to avoid to many uncompatibility problems. 2024-03-18 15:13:43 +01:00
Hystepik
d82729e49d New data struture for references field in ticket 2024-03-18 15:11:50 +01:00
Laurent Destailleur
b72b38f5d1 Doc 2024-03-18 15:03:41 +01:00
Laurent Destailleur
cf57ce77fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-18 14:58:23 +01:00
Laurent Destailleur
72d758e054 Doc 2024-03-18 14:56:54 +01:00
Laurent Destailleur
1b46072a81
Merge pull request #28941 from frederic34/patch-9
Update pgsql.class.php for deprecated parameters
2024-03-18 14:45:58 +01:00
Laurent Destailleur
034ce8cb98 Fix trans key code 2024-03-18 14:44:18 +01:00
Laurent Destailleur
de4933f814
Merge pull request #28940 from lamrani002/customTemplateMail
NEW auto fill infos in template email
2024-03-18 14:43:10 +01:00
Laurent Destailleur
dd109a8ab2
Merge pull request #28929 from ksar-ksar/19.0
FIX : Issue with special characters in French
2024-03-18 14:42:00 +01:00
Laurent Destailleur
7b0aacc239
Merge pull request #28939 from frederic34/patch-8
fix migration for postgresql  19.0.0 -> 20.0.0
2024-03-18 14:41:09 +01:00