Commit graph

140943 commits

Author SHA1 Message Date
Frédéric France
da7675c822
fix phpstan 2025-01-11 17:45:29 +01:00
Frédéric France
b4babd6fcb
fix phpstan 2025-01-11 10:46:57 +01:00
Frédéric France
c28f5ba1be
fix phpstan 2025-01-11 09:58:01 +01:00
Frédéric France
1652b5b178
fix phpstan 2025-01-11 09:53:00 +01:00
Frédéric France
44bfbb7f4a
fix phpstan 2025-01-11 09:24:21 +01:00
Frédéric France
6d845eefa1
fix phpstan 2025-01-11 09:16:13 +01:00
Frédéric France
714aa5b529
fix phpstan 2025-01-11 09:14:43 +01:00
Frédéric France
a355dbb660
fix phpstan 2025-01-11 09:04:55 +01:00
Laurent Destailleur
546bc6ffb9
Merge pull request #32618 from frederic34/patch-10
fix phpstan
2025-01-10 23:23:48 +01:00
Frédéric FRANCE
deb7663337
Merge branch 'develop' into patch-10 2025-01-10 16:41:31 +01:00
Laurent Destailleur (aka Eldy)
b48c9239df Fix js console warnings of html into option 2025-01-10 13:47:53 +01:00
Laurent Destailleur (aka Eldy)
5f2c05d5f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-10 13:34:41 +01:00
Frédéric FRANCE
04f3f56978
fix phpstan 2025-01-10 13:27:58 +01:00
Laurent Destailleur (aka Eldy)
7c3b92e02b NEW Add ip into table of website accounts 2025-01-10 13:04:12 +01:00
Laurent Destailleur
a9fbea57ff
Merge pull request #32602 from frederic34/modExpedition
fix phpstan
2025-01-10 12:24:21 +01:00
Laurent Destailleur
316b76f754
Merge pull request #32607 from frederic34/odtphp
add odtphp to phpstan check
2025-01-10 12:07:23 +01:00
Laurent Destailleur (aka Eldy)
40eb24917b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-10 10:43:05 +01:00
Laurent Destailleur (aka Eldy)
4527a0eb31 Debug v21 2025-01-09 22:15:24 +01:00
Frédéric France
74b445ac31
fix phpstan 2025-01-09 21:38:06 +01:00
Frédéric France
1ba37602bc
fix phpstan 2025-01-09 21:27:13 +01:00
Frédéric France
ba956df9c6
fix phpstan 2025-01-09 21:18:21 +01:00
Frédéric France
23c2f0de53
Merge remote-tracking branch 'upstream/develop' into odtphp 2025-01-09 21:11:55 +01:00
Frédéric France
8ad5751d91
fix phpstan 2025-01-09 21:11:26 +01:00
Frédéric France
01a956a48a
add odtphp to phpstan check 2025-01-09 21:01:00 +01:00
Frédéric France
a8fa5e57d1
fix phpstan 2025-01-09 20:07:40 +01:00
Frédéric France
d6aa69a950
fix phpstan 2025-01-09 20:02:11 +01:00
Laurent Destailleur
e05acff8e0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:39:04 +01:00
Laurent Destailleur
b53477752a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:38:56 +01:00
Maxime Kohlhaas
8cb41a5bea Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
d5a36eee15 Add OVER on list of reserved words 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
36262d201c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
87436c8798 Fix regression after a fix 2025-01-09 19:38:56 +01:00
Laurent Destailleur
1a9fbbbbea Merge pull request #32578 from fappels/21_modulebuilder_backward_compat
Fix modulebuilder backward compatibility.
2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
4e042a71d2 Fix remove dead code 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
781456e174 Debug v21 2025-01-09 19:38:56 +01:00
Alexandre Janniaux
d38f41871c bookkeeping: listbyaccount: fix $num_rows warning
Fix the following warning:

	Warning: Undefined property: PgSql\Result::$num_rows in
	/var/www/html/accountancy/bookkeeping/listbyaccount.php on line 160

The warning is happening when listing the operations after the
accounting setup is done but no accounts for bank nor operations are
created.
2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
87de003941 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
350df4ff92 Fix typo 2025-01-09 19:38:56 +01:00
Laurent Destailleur
02dfc35c85 Merge pull request #32571 from fappels/21_mobulebuilder
Fix modulebuilder double NothingToSetup
2025-01-09 19:38:56 +01:00
Alexandre Janniaux
f895c8a2ff expensereportsjournal: fix empty IN () SQL request
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in
fatal errors.

We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.

It also fixes the following error on the development PHP output:

    Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1 ($result)
    must be of type PgSql\Result, bool given in
    /var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
    /var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
    /var/www/html/accountancy/journal/expensereportsjournal.php(264):
    DoliDBPgsql->num_rows(false) #2 {main} thrown in
    /var/www/html/core/db/pgsql.class.php on line 654

Refs #32374 but for the expensereportsjournal page.
2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
08c0ad2c13 Fix regression 2025-01-09 19:38:56 +01:00
Alexandre Janniaux
7e1c87e3ab purchasesjournal: fix empty IN () SQL request
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in the
following fatal error:

	GROUP BY fk_facture_fourn
	    33 DoliDBPgsql::query SQL Error message: ERROR:  42601: syntax error at or near ")"
	LINE 10:  AND fk_facture_fourn IN ()
                                           ^

We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.

It also fixes the following error on the development PHP output.

	Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1
	($result) must be of type PgSql\Result, bool given in
	/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
	/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
	/var/www/html/accountancy/journal/purchasesjournal.php(418):
	DoliDBPgsql->num_rows(false) #2 {main} thrown in
	/var/www/html/core/db/pgsql.class.php on line 654

Fixes #32374
2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
d819742620 Debug v21 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
ba53390040 Debug v21 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
6e384a6d3a Debug v21 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
c04b6fca78 Fix to allow use of payment in frame 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
48bbcaaa12 Restore lines commented for test 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
5b603b86d6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
bd5a9a9f6f Debug v21 2025-01-09 19:38:56 +01:00
Laurent Destailleur (aka Eldy)
9aa24d9d9a FIX CVE-2024-55227 and CVE-2024-55228 CSRF when
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-09 19:38:56 +01:00