Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur
c02194a3c5 Doc 2024-04-29 16:32:28 +02:00
Laurent Destailleur
f008bf3473 More log 2024-04-29 13:48:26 +02:00
Laurent Destailleur
f5adfeca59 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-29 13:39:20 +02:00
Laurent Destailleur
d9847070b3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-29 13:34:41 +02:00
Laurent Destailleur
94e93aea05 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-29 13:32:47 +02:00
Laurent Destailleur
ff54b1cb5a Fix regression in permission test for list of holiday 2024-04-29 13:31:41 +02:00
Laurent Destailleur
a4535dec61 Fix regression in permission test 2024-04-29 13:29:40 +02:00
Laurent Destailleur
de4e7a7b70 Debug v20 2024-04-29 12:52:46 +02:00
Laurent Destailleur
9c2f98be94 Fix cti 2024-04-29 12:03:01 +02:00
Laurent Destailleur
77ac3fe3f0 Fix error 2024-04-29 11:34:58 +02:00
Laurent Destailleur
c6ac75fe78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-29 11:33:08 +02:00
Laurent Destailleur
d3fe7fca09 Try to fix cti 2024-04-29 11:32:54 +02:00
Eric
ea9a6c0162
NEW add relation type on element_element (#29329)
* add relation type on element_element

* add column on migration 19 -> 20
2024-04-29 11:29:32 +02:00
Laurent Destailleur
2bd6b32974 Doc 2024-04-29 11:08:55 +02:00
Laurent Destailleur
9e654e65dd Debug v20 2024-04-29 11:04:19 +02:00
Laurent Destailleur
dcecfbbc55 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-29 09:24:03 +02:00
Laurent Destailleur
d488ca2070 FIX #26015 2024-04-29 09:23:40 +02:00
Laurent Destailleur
37f6731d7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-28 23:02:25 +02:00
Laurent Destailleur
3f23e94701 Better error message 2024-04-28 23:01:35 +02:00
Anthony Berton
499a493c20
NEW: Param to show main menu logo in color look and feel (#29305)
* NEW: Param to show main menu logo in color look and feel

* Update ChangeLog

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2024-04-28 22:19:05 +02:00
Laurent Destailleur
a08714e6d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-28 22:16:23 +02:00
Anthony Berton
fffa30fdc8
FIX - Search user in where propal and order (#29374)
* FIX - INNER JOIN for search user

* Search in where no joint

* FIX - Propal

* FIX

* Update list.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-28 22:16:12 +02:00
Laurent Destailleur
cb604da904 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-04-28 22:16:01 +02:00
Frédéric FRANCE
eb995aec43
fix phpstan (#29521) 2024-04-28 21:57:28 +02:00
Laurent Destailleur
d35dd5a5a2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-28 21:57:00 +02:00
Laurent Destailleur
1af7ad923c Fix phan 2024-04-28 21:56:41 +02:00
Frédéric FRANCE
7c73d7d2bd
fix phpstan (#29520)
* fix phpstan

* Update user.class.php

* typo
2024-04-28 18:20:58 +02:00
Laurent Destailleur
d0394d698c CSS 2024-04-28 18:18:59 +02:00
Laurent Destailleur
1b60e571fe Debug v20 2024-04-28 18:10:37 +02:00
Laurent Destailleur
272275147c Typo in var name 2024-04-28 17:49:37 +02:00
Mohamed DAOUD
330227482d
New: modify payment page display and returns when it is embedded into a website (#29442)
* remove header and footer

* Updates to integrate the payment system into website

* Update stripe.lang

* Update onlinepaymentlinks.tpl.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-28 17:47:49 +02:00
Frédéric FRANCE
f8ea179029
fix phan (#29519) 2024-04-28 17:38:54 +02:00
Laurent Destailleur
8963940c20 Fix phan 2024-04-28 17:38:39 +02:00
Laurent Destailleur
f9fbbb2706 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-28 17:36:44 +02:00
Laurent Destailleur
2aea004cba Fix phan 2024-04-28 17:36:33 +02:00
thibdrev
bc6c31cba4
qual: phpstan for ProductCombination.class.php (#29518)
* qual: phpstan for ProductCombination.class.php

htdocs/variants/class/ProductCombination.class.php	725	Method ProductCombination::getUniqueAttributesAndValuesByFkProductParent() should return array<ProductAttributeValue> but returns array<int<0,max>,stdClass>.

* Update ProductCombination.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-28 17:36:25 +02:00
Frédéric FRANCE
f1dc60dcc7
fix phan (#29514)
* Update product_lot.php

* Update replenishment.lib.php

* Update product.class.php

* Update product.class.php

* fix phan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-28 17:25:15 +02:00
Laurent Destailleur
d1d68fdf8a Fix phan 2024-04-28 17:24:31 +02:00
Laurent Destailleur
6358f89c0d Fix phan warnings 2024-04-28 17:10:51 +02:00
Laurent Destailleur
29b6d6b918 Add phpstan version in report 2024-04-28 16:20:44 +02:00
Laurent Destailleur
7c8baea64f Fix phan warnings 2024-04-28 16:09:31 +02:00
Laurent Destailleur
55c8048639 Try to fix phan warnings 2024-04-28 13:02:49 +02:00
Laurent Destailleur
45acd65cc3 Try to fix phan warning 2024-04-28 12:48:36 +02:00
Laurent Destailleur
21995b881b Try to fix phan warning 2024-04-28 12:45:52 +02:00
Laurent Destailleur
6f689c137b css 2024-04-28 12:41:36 +02:00
Laurent Destailleur
b1cae2a702 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-28 12:32:03 +02:00
Frédéric FRANCE
ff35192b64
fix phan (#29513)
* fix phan

* Update donation.php

* Update project.php

* Update facture.class.php
2024-04-28 12:31:54 +02:00
Laurent Destailleur
21d8925bb9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-04-28 12:31:40 +02:00
Laurent Destailleur
ca2f0c43ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-28 12:31:17 +02:00
Laurent Destailleur
2862a61ee1 Clean code 2024-04-28 02:19:04 +02:00