Commit graph

151292 commits

Author SHA1 Message Date
Hystepik
3fcdba2bc3 better fix for performance 2025-01-09 09:21:45 +01:00
Regis Houssin
8e427353e0 FIX avoid to show html entities 2025-01-09 07:39:24 +01:00
Laurent Destailleur (aka Eldy)
32d9faeb39 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-09 02:28:19 +01:00
Laurent Destailleur (aka Eldy)
539c8b3e74 Fix remove tables not into project 2025-01-09 02:28:00 +01:00
Laurent Destailleur (aka Eldy)
631a31c103 Debug v21 2025-01-09 02:23:32 +01:00
Laurent Destailleur (aka Eldy)
a7a50b39a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 02:02:09 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur
249dfe1bea
Merge pull request #32581 from francoisPE/fix_bg_fact_fourn
FIX pdf_cannelle (supplier_invoice) add background - Complete #17243
2025-01-09 01:52:22 +01:00
Laurent Destailleur
bd08efc497
Merge pull request #32575 from altairisfr/reception_picto
FIX: reception picto alignement in product menu
2025-01-09 01:48:42 +01:00
Laurent Destailleur
441b8d08ba
Merge pull request #32585 from PsyCrow-code/20.0
Error on function purgeSessions() at admin.lib.php
2025-01-09 01:46:21 +01:00
Alexandre Janniaux
bea62d5cd9 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 01:45:25 +01:00
Laurent Destailleur
0d3825e47d
Merge pull request #32576 from alexandre-janniaux/bookkeeping-listbyaccount-pg/1
bookkeeping: listbyaccount: fix $num_rows warning
2025-01-09 01:45:00 +01:00
Laurent Destailleur
b9d35ff580
Merge pull request #32584 from hregis/fix_dev_avoid_warnings
FIX avoid warnings + debug
2025-01-09 01:44:28 +01:00
Laurent Destailleur
580d279da6
Merge pull request #32582 from hregis/fix_dev_xdebug3
FIX compatibility with xdebug 3
2025-01-09 01:43:20 +01:00
Laurent Destailleur (aka Eldy)
cfc22f6884 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-09 01:41:49 +01:00
Laurent Destailleur (aka Eldy)
8e551100a1 Fix typo 2025-01-09 01:41:24 +01:00
Laurent Destailleur
8b43b60171
Merge pull request #32571 from fappels/21_mobulebuilder
Fix modulebuilder double NothingToSetup
2025-01-09 01:35:38 +01:00
Alexandre Janniaux
3058f54f9e 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 01:34:23 +01:00
Laurent Destailleur
eef11a27d5
Merge pull request #32574 from alexandre-janniaux/32374-expensereportsjournal/1
expensereportsjournal: fix empty IN () SQL request
2025-01-09 01:34:08 +01:00
Alexandre Janniaux
6aae924377 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 01:33:27 +01:00
Laurent Destailleur
37bc7918cd
Merge pull request #32573 from alexandre-janniaux/fix-32374-purchasesjournal
purchasesjournal: fix empty IN () SQL request
2025-01-09 01:32:19 +01:00
Laurent Destailleur (aka Eldy)
3b45a24c07 Fix regression 2025-01-09 01:30:13 +01:00
Laurent Destailleur (aka Eldy)
9fb463481e Sync transifex 2025-01-09 01:16:51 +01:00
Laurent Destailleur (aka Eldy)
d75e02fd43 Debug v21 2025-01-08 23:52:35 +01:00
Laurent Destailleur (aka Eldy)
08b77d174d Debug v21 2025-01-08 23:29:32 +01:00
Laurent Destailleur (aka Eldy)
0c58529d2d Debug v21 2025-01-08 23:29:04 +01:00
PsyCrow
b9b58072ca
Merge branch '20.0' into 20.0 2025-01-08 16:22:02 -06:00
Laurent Destailleur (aka Eldy)
e774bc4065 Debug v21 2025-01-08 21:32:09 +01:00
Laurent Destailleur (aka Eldy)
5fef2d7287 Debug v21 2025-01-08 21:31:07 +01:00
Regis Houssin
929aa8ee91 FIX avoid warnings + debug 2025-01-08 20:32:19 +01:00
Regis Houssin
4ab4c2772b FIX compatibility with xdebug 3 2025-01-08 19:26:14 +01:00
Laurent Destailleur (aka Eldy)
f186608695 Fix to allow use of payment in frame 2025-01-08 18:47:31 +01:00
Laurent Destailleur (aka Eldy)
599d891284 Restore lines commented for test 2025-01-08 18:24:46 +01:00
Laurent Destailleur (aka Eldy)
79ae59ee2a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-08 17:54:13 +01:00
Laurent Destailleur (aka Eldy)
13039a2942 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-08 17:45:45 +01:00
Laurent Destailleur (aka Eldy)
7f8295a30c Debug v21 2025-01-08 17:45:28 +01:00
Laurent Destailleur (aka Eldy)
c0250e4c91 FIX CVE-2024-55227 CSRF when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-08 17:41:45 +01:00
William Mead
3415fffaac Added status update on addTimeSpent 2025-01-08 17:14:05 +01:00
Amael-PE
21e997acd7 FIX Continue for eagle_proforma 2025-01-08 17:06:19 +01:00
Amael-PE
ea94370486 FIX Complete wath was started in #17243 for pdf_cannelle 2025-01-08 17:03:15 +01:00
Hystepik
0c05b8110f Fix fatal error on sprintf with translate 2025-01-08 16:19:06 +01:00
Francis Appels
504a8b8eaf Fix some modulebuilder backward compatibility 2025-01-08 16:04:06 +01:00
William Mead
3daf44bf68 Fixed status 2025-01-08 15:21:40 +01:00
Alexandre Janniaux
8cdd88e27d 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-08 15:17:05 +01:00
William Mead
f0c79bcb77 Merge branch 'develop' into NEW_taskClose 2025-01-08 15:04:25 +01:00
Alexandre Janniaux
5d778eedab 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-08 14:42:36 +01:00
Alexandre Janniaux
b9419a869c 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-08 14:42:09 +01:00
Noé Cendrier
fee2005faa FIX: reception picto alignement in product menu 2025-01-08 14:41:45 +01:00
GregM
3737f3c0cd FIX select 2 no record found 2025-01-08 12:30:46 +01:00
Francis Appels
4dd67503fd modulebuilder fix double NothingToSetup 2025-01-08 11:11:10 +01:00