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
Laurent Destailleur (aka Eldy)
9a61a6e6c9
Update files after moving build into dev/
2025-01-05 14:46:26 +01:00
Laurent Destailleur (aka Eldy)
c9519a1a5a
Move dir build into dev/build
2025-01-05 14:28:07 +01:00
Laurent Destailleur (aka Eldy)
4253fa54ec
Standardize name of field.
2025-01-05 14:05:50 +01:00
Laurent Destailleur (aka Eldy)
25a033c64e
Rename field to avoid conflict.
2025-01-05 13:53:16 +01:00
Laurent Destailleur (aka Eldy)
d832961311
Debug v21
2025-01-05 13:39:30 +01:00
Laurent Destailleur (aka Eldy)
9236a9899f
Debug v21
2025-01-05 13:38:02 +01:00
Laurent Destailleur (aka Eldy)
79eaf30638
Prepare v21
2025-01-05 12:53:10 +01:00
Laurent Destailleur
7c30a77120
Merge pull request #32511 from Easya-Solutions/fix-webportal-hooks-global-user
...
FIX logged user as global user for hooks in external modules (WebPortal)
2025-01-05 12:34:01 +01:00
Laurent Destailleur
db89b1a619
Merge pull request #32517 from frederic34/fix_phpstan_2025_01_03
...
fix phpstan
2025-01-05 12:32:54 +01:00
Laurent Destailleur (aka Eldy)
6a492eaf4e
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-05 12:31:33 +01:00
Laurent Destailleur
41cfaf8a61
Merge pull request #32522 from frederic34/patch-10
...
Update .pre-commit-config.yaml
2025-01-05 12:07:36 +01:00
Laurent Destailleur
a32ae3cd37
Merge pull request #32525 from hregis/fix_20_broken_feature_pa_ht_is_float
...
FIX broken feature with check $pa_ht_isemptystring
2025-01-05 12:06:10 +01:00
Erik van Berkum
f836156414
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 16:44:41 +09:00
Regis Houssin
724567c291
FIX broken feature with check $pa_ht_isemptystring
2025-01-04 22:44:57 +01:00
Frédéric France
51de37712b
fix
2025-01-04 16:24:17 +01:00