Commit graph

140170 commits

Author SHA1 Message Date
Laurent Destailleur
0e2008ab50
Merge pull request #32399 from atm-irvine/fix_fk_societe_rib
FIX : fk_societe_rib
2024-12-17 17:02:42 +01:00
Laurent Destailleur (aka Eldy)
81e64ed9a4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-12-17 16:59:13 +01:00
Laurent Destailleur (aka Eldy)
91eb9fc9fb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-12-17 16:54:55 +01:00
Laurent Destailleur (aka Eldy)
d16dd82297 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-12-17 16:40:29 +01:00
Irvine Fleith
2f93bac9bf FIX : fk_societe_rib 2024-12-17 15:52:39 +01:00
Laurent Destailleur (aka Eldy)
3fa0b65c0c Fix filter on contact 2024-12-17 13:33:29 +01:00
Laurent Destailleur
2c583ced57
Merge pull request #32392 from alsoft10/20.0.32391
FIX#32391
2024-12-17 12:56:31 +01:00
Laurent Destailleur (aka Eldy)
8813d7918d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-12-17 12:10:20 +01:00
Laurent Destailleur (aka Eldy)
f8a36a0283 Add link to CVE.org 2024-12-17 11:07:57 +01:00
Laurent Destailleur (aka Eldy)
51b217d32d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-17 10:15:47 +01:00
Laurent Destailleur (aka Eldy)
55c6feef8c Fix css 2024-12-17 10:15:32 +01:00
alsoft10
83fb45a6ba FIX#32391 2024-12-17 14:04:02 +05:30
Laurent Destailleur
8fcf8a4712
Merge pull request #32370 from frederic34/phpstan_2024_12_15
fix phpstan
2024-12-17 02:57:34 +01:00
Laurent Destailleur
adb5248043
Merge pull request #32373 from defrance/patch-987740
fix login error on update with captcha
2024-12-17 02:53:33 +01:00
Laurent Destailleur
7b1005264c
Merge branch 'develop' into patch-987740 2024-12-17 02:52:20 +01:00
Laurent Destailleur
be5f58f2b0
Merge pull request #32377 from alexandre-janniaux/tab-sells-journal/1
Qual: sellsjournal: remove tab character in SQL
2024-12-17 02:51:53 +01:00
Laurent Destailleur
63ec064552
Merge branch 'develop' into phpstan_2024_12_15 2024-12-17 02:50:52 +01:00
Laurent Destailleur
b17167db2a
Merge pull request #32320 from frederic34/contact_canvas_phpstan
fix phan and phpstan
2024-12-17 02:20:42 +01:00
Laurent Destailleur
dece33943e
Merge branch 'develop' into phpstan_2024_12_15 2024-12-17 02:16:22 +01:00
Laurent Destailleur
10c29023be
Merge pull request #32378 from alexandre-janniaux/fix-32376-lettering-issue
FIX #32376: lettering: fix ifsql() called with invalid $check parameter
2024-12-17 02:08:32 +01:00
Laurent Destailleur
b8f094f121
Merge pull request #32386 from altairisfr/prod_nature
FIX: comparing strings with numbers can be touchy
2024-12-17 02:06:01 +01:00
Laurent Destailleur
b1aa23553e
Merge pull request #32388 from frederic34/fix_phan
clean phan baseline
2024-12-17 02:03:21 +01:00
Frédéric France
0299cb8296
clean phan baseline 2024-12-16 20:48:30 +01:00
Frédéric France
35d0f91d34
clean baseline 2024-12-16 20:28:55 +01:00
Frédéric France
ec8ae6b35b
Merge remote-tracking branch 'upstream/develop' into contact_canvas_phpstan 2024-12-16 20:13:56 +01:00
Laurent Destailleur (aka Eldy)
07c2feb69c Fix end date of survey (day must be included) 2024-12-16 18:34:21 +01:00
Noé Cendrier
5573ca35c3 FIX: comparing strings with numbers can be touchy 2024-12-16 15:32:54 +01:00
Laurent Destailleur (aka Eldy)
69b30ac8c4 Debug v21 2024-12-16 14:52:36 +01:00
Frédéric FRANCE
d1e39c6c48
Merge remote-tracking branch 'upstream/develop' into phpstan_2024_12_15 2024-12-16 14:21:46 +01:00
Frédéric FRANCE
c40567a98c
fix phpstan 2024-12-16 14:21:32 +01:00
Laurent Destailleur (aka Eldy)
bf7b776653 FIX add a line in expensereport refused 2024-12-16 14:00:04 +01:00
Frédéric FRANCE
daeb4c9b5d
fix phpstan 2024-12-16 13:48:13 +01:00
Laurent Destailleur (aka Eldy)
b34c0beddc Debug v21 - filter import id 2024-12-16 13:45:48 +01:00
Laurent Destailleur (aka Eldy)
a6da3b189a Not required, but for better code consistency 2024-12-16 12:59:16 +01:00
Frédéric FRANCE
4d9b398437
fix phpstan 2024-12-16 11:17:10 +01:00
Frédéric FRANCE
843349b2df
Merge remote-tracking branch 'upstream/develop' into contact_canvas_phpstan 2024-12-16 11:12:56 +01:00
Frédéric FRANCE
23e14b7779
fix phpstan 2024-12-16 11:12:42 +01:00
Frédéric FRANCE
ae69785f4f
fix phpstan 2024-12-16 10:50:04 +01:00
Laurent Destailleur (aka Eldy)
bf7e7337ee Trans 2024-12-16 10:05:31 +01:00
Frédéric FRANCE
2dbcbce0b4
fix phpstan 2024-12-16 09:55:42 +01:00
Frédéric FRANCE
97e1d3a05e
Merge remote-tracking branch 'upstream/develop' into contact_canvas_phpstan 2024-12-16 09:42:35 +01:00
Alexandre Janniaux
45f6905bae FIX #32376: lettering: fix ifsql() called with invalid $check parameter
The $check is supposed to be a check retuning a boolean. By being an
`if (value)` check instead of being an `if (value IS NOT NULL)` check,
postgresql complains the types are not correct:

        Error ERROR: 42804: argument of CASE/WHEN must be type boolean,
        not type integer LINE 1: ...k, tl2.fk_doc FROM ( SELECT DISTINCT
        (CASE WHEN tll.fk_fac... ^ LOCATION: coerce_to_boolean,
        parse_coerce.c:1176

Regression from commit cfc162a31d.
2024-12-15 18:39:40 +01:00
Laurent Destailleur (aka Eldy)
46c80f51d6 Debug v21 2024-12-15 18:35:11 +01:00
Alexandre Janniaux
1c7deda18d sellsjournal: remove tab character in SQL
It shows as the following in the logs:

        GROUP BY fk_facture
        \x09AND fk_facture IN (8)
            AND fd.total_ttc <> 0
            AND fd.fk_code_ventilation <= 0
            fd.product_type <= 2
        WHERE
        \x09llx_facturedet as fd
        FROM
2024-12-15 17:56:25 +01:00
Laurent Destailleur (aka Eldy)
81f0bb8921 Debug v21 2024-12-15 17:47:08 +01:00
Laurent Destailleur (aka Eldy)
65f9e7f172 Fix parsing input date for eldy calendar when using short year 2024-12-15 15:38:38 +01:00
Charlène Benke
7c94a01cc5
Update login.tpl.php 2024-12-15 14:01:33 +01:00
Charlène Benke
03bf9c9a4f
fix login error on update with captcha 2024-12-15 13:57:45 +01:00
Frédéric France
a174795a60
tests 2024-12-15 13:16:40 +01:00
Frédéric France
6e68fc7fa8
tests 2024-12-15 12:13:12 +01:00