Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 11:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
140,817 Commits 39 Branches 191 Tags
41b07d1630a9707f0cc201f70ef2b06cd98ee40a
Commit Graph

140817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
41b07d1630 FIX compatibility with externals modules 2025-01-09 10:36:48 +01:00
Regis Houssin
4934a335b0 FIX use transnoentities to avoid html entities 2025-01-09 10:09:23 +01:00
Regis Houssin
8e427353e0 FIX avoid to show html entities 2025-01-09 07:39:24 +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
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
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
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
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)
9fb463481e Sync transifex 2025-01-09 01:16:51 +01:00
Laurent Destailleur (aka Eldy)
0c58529d2d Debug v21 2025-01-08 23:29:04 +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)
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
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
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
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)
8febf249ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:22 +01:00
Laurent Destailleur (aka Eldy)
710ed35a22 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:12 +01:00
Laurent Destailleur (aka Eldy)
a1003a1a90 Fix regression 2025-01-07 21:46:32 +01:00
Laurent Destailleur
de208ace1d Merge pull request #32567 from frederic34/mod_member 
fix phpstan
 2025-01-07 21:28:26 +01:00
Laurent Destailleur (aka Eldy)
badb23635b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:03:59 +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)
c3f06059cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 19:12:54 +01:00
Frédéric France
fa2be8a553 fix phpstan 2025-01-07 18:54:08 +01:00
Frédéric France
d4714983f1 fix phpstan 2025-01-07 18:31:56 +01:00
Frédéric France
b6fc9f4d86 fix phpstan 2025-01-07 18:30:27 +01:00
Laurent Destailleur (aka Eldy)
e5bb7e48db Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 17:20:06 +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
afe3856d9d Merge pull request #32554 from Daoud-mohamed/fix-website-purge-function 
Fix Website Purge Function
 2025-01-07 14:01:44 +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
3b480109c9 Merge pull request #32534 from frederic34/fix_phpstan_2025_01_05_01 
fix phpstan
 2025-01-07 13:41:30 +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