Commit Graph

140679 Commits

Author SHA1 Message Date
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
Francis Appels
4dd67503fd modulebuilder fix double NothingToSetup 2025-01-08 11:11:10 +01:00
Laurent Destailleur
2423ca87d3 Merge pull request #32561 from aspangaro/21PCG25
Update Chart of account FR_fr PCG14-DEV to PCG25-DEV
2025-01-07 21:50:25 +01:00
Laurent Destailleur (aka Eldy)
a1003a1a90 Fix regression 2025-01-07 21:46:32 +01:00
Laurent Destailleur (aka Eldy)
43e054d5e8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-07 21:00:54 +01:00
Laurent Destailleur (aka Eldy)
2e3a925db0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-07 21:00:29 +01:00
Laurent Destailleur (aka Eldy)
16683de9f3 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-07 21:00:15 +01:00
Laurent Destailleur (aka Eldy)
dd7b7a8584 FIX Bad calculation of the theoretical stock. Did not take into account
the inc/dec stock option.
2025-01-07 20:58:16 +01:00
Laurent Destailleur (aka Eldy)
5422965972 Debug v21 2025-01-07 17:19:40 +01:00
Laurent Destailleur
973b6b8bdf Merge pull request #32555 from FHenry/20.0_fix_catching_error_on_Notification
fix: manage error in Notification trigger
2025-01-07 16:00:52 +01:00
Laurent Destailleur
1d8f9fd24b Update interface_50_modNotification_Notification.class.php 2025-01-07 16:00:31 +01:00
Laurent Destailleur
fc54c837fa Update interface_50_modNotification_Notification.class.php 2025-01-07 15:59:07 +01:00
Alexandre SPANGARO
f90c1f7c51 Update Chart of account FR_fr PCG14-DEV to PCG25-DEV 2025-01-07 14:38:19 +01:00
Mohamed DAOUD
e7b87fa1d1 fix website purge function 2025-01-07 14:02:53 +01:00
Laurent Destailleur
31342b31eb Merge pull request #32550 from aspangaro/21PCG25
Update Chart of account FR_fr PCG14-DEV to PCG25-DEV
2025-01-07 13:45:33 +01:00
Laurent Destailleur (aka Eldy)
c3dddfc96e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-07 13:34:50 +01:00
Laurent Destailleur (aka Eldy)
6b94a458c0 Fix warning 2025-01-07 13:34:33 +01:00
Florian HENRY
daa18360d7 fix: manage error in Notification triggers 2025-01-07 13:16:32 +01:00
Laurent Destailleur
6bb4ee81ca Debug v21 2025-01-07 12:13:05 +01:00
Laurent Destailleur
75c2c93d3b Prepare v21 2025-01-07 11:44:59 +01:00
Laurent Destailleur
1db2897531 Debug v21 2025-01-07 11:24:01 +01:00
Laurent Destailleur
fd97cee0ef Debug v21 2025-01-07 11:13:27 +01:00
Laurent Destailleur
3b605c2184 Debug v21 2025-01-07 10:43:45 +01:00
Alexandre SPANGARO
931081e645 Fix id_parent 2025-01-07 08:20:37 +01:00
Alexandre SPANGARO
c89398c9be Fix id_parent 2025-01-07 08:13:16 +01:00
Alexandre SPANGARO
aeb4537ef7 Update Chart of account FR_fr PCG14-DEV to PCG25-DEV 2025-01-06 23:50:39 +01:00
Laurent Destailleur (aka Eldy)
1544aafa51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-06 17:43:35 +01:00
Laurent Destailleur (aka Eldy)
5a5c9dbe02 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-06 17:43:13 +01:00
Laurent Destailleur (aka Eldy)
b4848d90f6 Doc 2025-01-06 17:14:50 +01:00
Laurent Destailleur (aka Eldy)
7f5939c8c3 Update mysql 2025-01-06 16:53:57 +01:00
Laurent Destailleur
6d01a36a26 Merge pull request #32523 from hregis/fix_20_add_todo
FIX $this->origin_object can not be instanceof CommandeFournisseur if it is already an instanceof CommonObject
2025-01-06 16:47:26 +01:00
Laurent Destailleur
76c314569c Merge pull request #32547 from Dolibarr/revert-32544-fix_21_missing_entity_field
Revert "FIX missing entity field in llx_holiday_config"
2025-01-06 16:33:22 +01:00
Laurent Destailleur (aka Eldy)
3987fc6289 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-06 16:18:42 +01:00
Laurent Destailleur (aka Eldy)
b965ee3519 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-06 16:11:48 +01:00