Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
716c89219b Prepare v22 2025-01-05 18:04:56 +01:00
Laurent Destailleur
377233d998
Merge pull request #32394 from Easya-Solutions/develop_new_odt_invoice_type
NEW : ODT {object_type_label} for Invoices and Supplier Invoices
2025-01-05 18:02:18 +01:00
Laurent Destailleur
3b647aca5e
Merge pull request #32439 from thersane-john/2024_new_factoring
New : Add hook
2025-01-05 18:01:44 +01:00
Laurent Destailleur
4d818d0d10
Merge pull request #32531 from frederic34/fix_phpstan_2025_01_05
fix phpstan
2025-01-05 18:00:41 +01:00
Regis Houssin
5b0d24a139 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into fix_20_add_todo 2025-01-05 17:49:25 +01:00
Regis Houssin
3e952e7694 FIX refactorize (maybe broken feature for not received completely) 2025-01-05 17:47:24 +01:00
Erik van Berkum
b3c286a673 FIX units product
solves issue #32495: current Empty testing for 0 results in TRUE and
makes it an empty string. Testing for is_null solves the issue.

this issue is connected with pull FIX #32496
2025-01-05 17:43:23 +01:00
Regis Houssin
33c90c752e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into fix_20_add_todo 2025-01-05 17:41:21 +01:00
Laurent Destailleur
001fc9107b
Merge pull request #32527 from erikvanberkum/develop
FIX units product
2025-01-05 17:41:09 +01:00
Regis Houssin
b1c82f4dbb FIX phan 2025-01-05 17:38:04 +01:00
Regis Houssin
350697832d FIX remove unused code 2025-01-05 17:35:32 +01:00
Regis Houssin
0aeb47f344 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into fix_20_broken_feature_pa_ht_is_float 2025-01-05 17:31:46 +01:00
Regis Houssin
672992a791 FIX same broken feature for propal and invoice 2025-01-05 17:30:54 +01:00
Laurent Destailleur
1fafc1b6ad
Merge branch '18.0' into fix-email-notification-ticket-assignee-18 2025-01-05 17:30:02 +01:00
Frédéric France
eb4e059683 fix 2025-01-05 17:29:46 +01:00
Laurent Destailleur
7c0425da78
Merge pull request #32520 from hregis/fix_20_avoid_error_with_product_combination
FIX clean unique extrafields when create product combination
2025-01-05 17:25:35 +01:00
Frédéric France
7a5356397f
fix phpstan 2025-01-05 17:23:31 +01:00
Laurent Destailleur
b5ff688841
Merge branch '18.0' into fix-email-notification-ticket-assignee-18 2025-01-05 17:23:20 +01:00
Laurent Destailleur (aka Eldy)
8805b8cac4 Exclude test files 2025-01-05 17:22:30 +01:00
Laurent Destailleur
d01a99cd79
Merge branch '18.0' into fix-email-notification-ticket-assignee-18 2025-01-05 17:16:58 +01:00
Frédéric France
68badc13ab
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05 2025-01-05 17:11:38 +01:00
Laurent Destailleur (aka Eldy)
1866713082 Avoid error 2025-01-05 17:10:00 +01:00
Frédéric France
a82c517e09
fix phpstan 2025-01-05 17:09:38 +01:00
Laurent Destailleur (aka Eldy)
9ecc88230f Test pr action 2025-01-05 17:08:02 +01:00
Laurent Destailleur
36437e3436
Merge branch 'develop' into develop 2025-01-05 16:54:30 +01:00
Laurent Destailleur
373ddac739
Merge branch '20.0' into fix_20_avoid_error_with_product_combination 2025-01-05 16:53:17 +01:00
Laurent Destailleur
fdd39afc6d
Merge pull request #32530 from hregis/fix_20_broken_feature_pa_ht_is_float
FIX avoid phan error
2025-01-05 16:52:40 +01:00
Laurent Destailleur
6c05e3741d
Merge pull request #32529 from mdeweerd/fix/copyrighttool
Fix: Copyright generation when single year
2025-01-05 16:51:59 +01:00
Laurent Destailleur (aka Eldy)
0ec3b7c858 Fix phpunit 2025-01-05 16:51:32 +01:00
Laurent Destailleur
4f989c14c9
Merge branch 'develop' into fix/copyrighttool 2025-01-05 16:32:30 +01:00
Laurent Destailleur (aka Eldy)
9b52c4a10a Fix CI github 2025-01-05 16:30:56 +01:00
Laurent Destailleur (aka Eldy)
a2eb970bb7 Fix type 2025-01-05 16:18:38 +01:00
Laurent Destailleur (aka Eldy)
3b1bc8bbb1 Prepare v22 dev 2025-01-05 16:14:21 +01:00
Laurent Destailleur (aka Eldy)
16e45e90c4 Doc 2025-01-05 16:13:56 +01:00
Regis Houssin
56e03c5d19 FIX on the road again 2025-01-05 16:09:03 +01:00
Regis Houssin
22ed2d6a25 FIX tic tac tic tac 2025-01-05 16:02:23 +01:00
Regis Houssin
d42c8ba012 FIX quelle perte de temps 2025-01-05 15:50:09 +01:00
Laurent Destailleur (aka Eldy)
a934cd49e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 15:42:01 +01:00
Laurent Destailleur (aka Eldy)
a9d526e74a Fix travis 2025-01-05 15:41:50 +01:00
Regis Houssin
91b90d7409 FIX avoid phan error 2025-01-05 15:41:29 +01:00
Laurent Destailleur (aka Eldy)
1aa703a631 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-05 15:39:44 +01:00
Laurent Destailleur (aka Eldy)
6a368edca1 Trans 2025-01-05 15:38:11 +01:00
Laurent Destailleur (aka Eldy)
2b9c4ab25f FIX #32387 2025-01-05 15:33:45 +01:00
Laurent Destailleur (aka Eldy)
2e79222e45 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-05 15:33:33 +01:00
Laurent Destailleur (aka Eldy)
d985190a53 FIX #32387 2025-01-05 15:32:24 +01:00
Laurent Destailleur
a226756b9b
Merge pull request #32499 from jyhere/jyhere/import-file-double-space-fix
FIX: double space file bug when using dolibarr import
2025-01-05 15:20:34 +01:00
Laurent Destailleur
0a2a0c9579
Merge branch '20.0' into fix_20_avoid_error_with_product_combination 2025-01-05 15:19:54 +01:00
Laurent Destailleur
aed4eb3c21
Merge pull request #32519 from priojk/patch-15
Backport of fix from v21 to v20
2025-01-05 15:18:10 +01:00
MDW
83f350bea4
Fix: Copyright generation when single year 2025-01-05 15:16:18 +01:00
Laurent Destailleur (aka Eldy)
64e83886fb Doc 2025-01-05 14:49:20 +01:00