Commit Graph

145227 Commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
81a4eec990 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-09 20:27:08 +01:00
Laurent Destailleur (aka Eldy)
e37b6fac4d Fix pb in output of label of email 2025-01-09 20:26:22 +01:00
Francis Appels
d1051db856 Fix php warning 2025-01-09 20:16:46 +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
Laurent Destailleur
ad32afb588 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:35:16 +01:00
Maxime Kohlhaas
1dc3a9796f Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
e75b72d467 Add OVER on list of reserved words 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
1fb7f8be36 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
802562a575 Fix regression after a fix 2025-01-09 19:35:01 +01:00
Laurent Destailleur
744f48b6ac Merge pull request #32578 from fappels/21_modulebuilder_backward_compat
Fix modulebuilder backward compatibility.
2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
0cc7d0c2ad Fix remove dead code 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
540d5438bc Debug v21 2025-01-09 19:35:01 +01:00
Alexandre Janniaux
81bde351d8 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:35:01 +01:00
Laurent Destailleur (aka Eldy)
2656b33044 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
b024b95948 Fix typo 2025-01-09 19:35:01 +01:00
Laurent Destailleur
f756e3fc38 Merge pull request #32571 from fappels/21_mobulebuilder
Fix modulebuilder double NothingToSetup
2025-01-09 19:35:01 +01:00
Alexandre Janniaux
c022a530e5 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:35:01 +01:00
Laurent Destailleur (aka Eldy)
1def03d66f Fix regression 2025-01-09 19:35:01 +01:00
Alexandre Janniaux
740ad5b0fd 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:35:01 +01:00
Laurent Destailleur (aka Eldy)
1f884b84ce Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
06914d9099 Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
6a8e13f2cc Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
494398956d Fix to allow use of payment in frame 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
0ffd31c1a1 Restore lines commented for test 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
6ba76fbfb0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 19:35:01 +01:00