2
0
forked from Wavyzz/dolibarr
Commit Graph

145947 Commits

Author SHA1 Message Date
Laurent Destailleur
ac892efb42 Fix CI 2025-07-01 16:22:21 +02:00
Laurent Destailleur
e2c2f73e9c Fix CI 2025-07-01 15:39:16 +02:00
Laurent Destailleur
2941cf1c19 Fix CI 2025-07-01 15:29:15 +02:00
Laurent Destailleur
e5aae4d7e3 Debug v22 2025-06-30 17:39:38 +02:00
Laurent Destailleur
495c45fde0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 16:26:46 +02:00
Charlène Benke
c0b4af32be FIX some error on donation list (#34666)
* fix some error on donation list

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-30 17:25:44 +03:00
Laurent Destailleur
8c8a45a191 Doc 2025-06-30 15:49:20 +02:00
Laurent Destailleur
fae0093b51 Debug v22 2025-06-30 15:47:49 +02:00
Laurent Destailleur
f974c49fcc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 15:14:31 +02:00
Laurent Destailleur
00ff8d490a Debug v22 2025-06-30 15:14:09 +02:00
github-actions[bot]
1d37671c67 PHPStan > Update baseline (#34664)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-30 15:35:03 +03:00
atm-lena
5253346fca Delete entity filter in user fetch (#34348)
* Delete entity filter in user fetch

* Fetch without entity if fetch by id

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-30 14:21:03 +02:00
Charlène Benke
95027c5dfd php error on takepos admin (#34660) 2025-06-29 12:45:52 +02:00
Alexandre SPANGARO
621b91097a Translate term Incoterm (#34661) 2025-06-29 12:45:29 +02:00
Alexandre SPANGARO
0d00a27a1c QUAL Use GetDolGlobalString (#34662)
* Typo comment

* Use getGlobalString
2025-06-29 12:43:14 +02:00
ldestailleur
38b752f367 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 18:57:10 +02:00
ldestailleur
27479f41c5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 18:56:46 +02:00
ldestailleur
29c953bd37 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 18:56:26 +02:00
ldestailleur
9d30492846 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 18:55:40 +02:00
ldestailleur
2bef534e60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:55:06 +02:00
ldestailleur
c0161ccead Fix CI 2025-06-28 18:54:53 +02:00
ldestailleur
1be67fee52 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:54:33 +02:00
ldestailleur
4a88509cdf Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:54:19 +02:00
ldestailleur
a4b1700bae Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 18:53:25 +02:00
ldestailleur
f5cb64afaa Fix CI 2025-06-28 18:53:12 +02:00
ldestailleur
2cbb6d9e1e Trans 2025-06-28 18:38:59 +02:00
ldestailleur
320364b364 Trans 2025-06-28 18:38:03 +02:00
ldestailleur
202f152a13 Trans 2025-06-28 18:36:00 +02:00
ldestailleur
bb0be51ad5 Better demo link 2025-06-28 18:24:26 +02:00
Marc de Lima Lucio
4841a8d2ce FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
* FIX: pre-send mail mass action: keep __EMAIL__ substitution

* FIX: comment

* test github workflows

* test github workflow for 18

* test v18 pr workflow

* FIX: massaction email tpl: keep preset

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 17:58:07 +02:00
ldestailleur
e82e451248 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:56:39 +02:00
ldestailleur
9d2cb0d078 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 17:56:12 +02:00
ldestailleur
74898efb5b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 17:55:53 +02:00
ldestailleur
919d9635ab Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 17:55:26 +02:00
ldestailleur
52a5d4ca0a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 17:55:04 +02:00
ldestailleur
cb0d39ff6e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 17:54:58 +02:00
ldestailleur
a5c51589d3 Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 17:54:41 +02:00
ldestailleur
b4501511c8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-06-28 17:54:22 +02:00
ldestailleur
e18c5b9d68 Fix CI 2025-06-28 17:40:01 +02:00
Vincent Maury
b940f2eae3 Fix bug in product->get_sousproduits_arbo (#34561)
* Update product.class.php

depending on php version used, when var $this->sousprods not correctly declared it'snot filled

* Update product.class.php

sousprods prop now initialized when declared

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 17:34:12 +02:00
ldestailleur
1c118b998c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:28:49 +02:00
ldestailleur
7402866c35 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:28:40 +02:00
ldestailleur
91283f3569 Merge 2025-06-28 17:24:03 +02:00
ldestailleur
7a54d65e8a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 17:22:00 +02:00
ldestailleur
d268fc42c2 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 17:20:08 +02:00
ldestailleur
e6ff31abf1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 17:19:04 +02:00
ldestailleur
d31bad82a1 Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 17:14:50 +02:00
ldestailleur
bc0b0bebd3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-06-28 17:09:51 +02:00
ldestailleur
031acacdab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2025-06-28 17:04:21 +02:00
Lucas Marcouiller
cde9632622 Fix some phan warnings (#34650)
* Fix some phan warnings

* Update defaultvalues.php

* Update hookmanager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 16:46:52 +02:00