Commit graph

137848 commits

Author SHA1 Message Date
ldestailleur
cb18bebb87 Fix warning on date 2025-02-16 14:23:16 +01:00
Laurent Destailleur
75590f1f09
Merge pull request #33078 from hregis/fix_20_sql_order_twice
FIX wrong ODT path for multicompany
2025-02-14 01:48:12 +01:00
Laurent Destailleur
9ebbf5be62
Merge branch '20.0' into fix_20_sql_order_twice 2025-02-13 20:47:23 +01:00
Laurent Destailleur (aka Eldy)
909fa449f6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-13 20:37:26 +01:00
Laurent Destailleur (aka Eldy)
256e0e0470 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-13 20:37:12 +01:00
Laurent Destailleur (aka Eldy)
054010f8ec Fix test 2025-02-13 20:34:55 +01:00
Laurent Destailleur (aka Eldy)
36fd5b7b26 FIX #CVE-2024-34051 2025-02-13 20:29:25 +01:00
Regis Houssin
8150cc6159 FIX wrong ODT path for multicompany 2025-02-13 18:20:47 +01:00
Laurent Destailleur
4394fe635d
Merge pull request #33077 from hregis/fix_20_sql_order_twice
FIX wrong path for odt models
2025-02-13 17:46:03 +01:00
Regis Houssin
c55eb6773c FIX wrong path for odt models 2025-02-13 17:16:35 +01:00
Laurent Destailleur
a0830145d6
Merge pull request #33045 from hregis/fix_20_sql_order_twice
FIX sql "order by" is defined twice
2025-02-13 14:23:50 +01:00
Regis Houssin
e0370a5143 FIX sql "order by" is defined twice 2025-02-13 11:00:22 +01:00
Laurent Destailleur (aka Eldy)
f2f1f5eedd Fix phpunit 2025-02-13 10:28:19 +01:00
Laurent Destailleur (aka Eldy)
0ef79d47d8 Fix warning 2025-02-12 22:43:01 +01:00
Laurent Destailleur (aka Eldy)
6ed8a0b65b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-12 15:48:56 +01:00
Laurent Destailleur (aka Eldy)
e381362d9c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-02-12 15:44:45 +01:00
Laurent Destailleur (aka Eldy)
7bc29c61a9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-02-12 15:44:30 +01:00
Laurent Destailleur
ea60024712
Merge pull request #33024 from Easya-Solutions/18.0_fix-shipment-with-same-product-in-other-subkit
FIX display full tree on shipment card when a kit contains a same component in other sub-kit
2025-02-12 04:02:13 +01:00
VESSILLER
edea44bccb FIX display full tree on shipment card when a kit contains a same component in other sub-kit 2025-02-11 17:12:15 +01:00
Laurent Destailleur
09df62600e
Merge pull request #32616 from rycks/18.0_fix_zero_is_a_value_into_dictionnary
zero could be a value
2025-02-11 09:07:29 +01:00
Eric Seigne
94eaf5d089 cancel first idea 2025-02-11 00:32:57 +01:00
Eric Seigne
d04ac67ecd backport 20.0 solution 2025-02-11 00:31:59 +01:00
Laurent Destailleur
81b9286ea4
Merge pull request #32999 from Easya-Solutions/18_FIX_missing_unset_post
Fix missing unset post fourn_ref
2025-02-10 13:21:34 +01:00
Laurent Destailleur
c648bd8c90
Merge pull request #32982 from Easya-Solutions/18.0_fix-shipment-dispatch-serial-warehouses
FIX bad dispatched quantities for batches on shipment card
2025-02-10 12:52:42 +01:00
Laurent Destailleur
99a291f878
Merge pull request #32979 from rycks/18.0_user_author_deprecated
fk_user_author instead of user_author into update
2025-02-10 11:57:25 +01:00
ulysse-vldn
47f10cdc29 Fix missing unset post fourn_ref 2025-02-10 09:55:47 +01:00
VESSILLER
7eba8832e6 FIX bad dispatched quantities for batches on shipment card 2025-02-07 15:47:36 +01:00
Eric Seigne
03340d6016 in case of old code in other part makes a direct assignation 2025-02-07 15:13:20 +01:00
Eric Seigne
d288fe74a2 fk_user_author instead of user_author into update 2025-02-07 15:05:49 +01:00
Laurent Destailleur
54c7484641
Merge pull request #32967 from frederic34/patch-11
clean code
2025-02-06 22:17:33 +01:00
Frédéric FRANCE
ab27a67996
clean code 2025-02-06 18:50:32 +01:00
Laurent Destailleur
28d588fd40
Merge pull request #32832 from Easya-Solutions/18.0_add_missing_hook_action_list
Missing hook PrintFieldListFrom on actions list
2025-02-06 18:23:15 +01:00
Laurent Destailleur (aka Eldy)
40f86ca101 FIX extrafields lost during creation from rec invoice 2025-02-06 18:13:25 +01:00
Laurent Destailleur (aka Eldy)
25b4ae0d33 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-06 16:25:56 +01:00
Laurent Destailleur
16a3ce91d9
Merge pull request #32963 from frederic34/patch-11
asset doesn't have lines
2025-02-06 16:24:07 +01:00
Laurent Destailleur (aka Eldy)
d8246d936a Fix css 2025-02-06 15:21:11 +01:00
Frédéric FRANCE
7e5a35cb45
asset doesn't have lines 2025-02-06 14:02:17 +01:00
Laurent Destailleur
74887afb15
Merge pull request #32955 from hregis/fix_20_price_not_update_clone
FIX Prices didn't update when clone a propale with update prices
2025-02-06 10:51:26 +01:00
Laurent Destailleur
b945673446
Merge pull request #32958 from frederic34/patch-11
fix CI
2025-02-05 23:34:31 +01:00
Laurent Destailleur
aac5bf1911
Merge pull request #32957 from fmarcet/20.0
Fix: Not loading all fields on fetch function
2025-02-05 23:34:09 +01:00
Frédéric FRANCE
a4ce67492d
fix CI 2025-02-05 18:55:32 +01:00
Ferran Marcet
6968e199ee Fix: Not loading all fields in fetch function 2025-02-05 18:45:29 +01:00
Juanjo Menent
929742c968 Merge branch '20.0up' into 20.0 2025-02-05 18:42:11 +01:00
Juanjo Menent
9615308f65 Merge remote-tracking branch 'origin/20.0' into 20.0 2025-02-05 18:40:54 +01:00
Laurent Destailleur (aka Eldy)
cffd5d422e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-05 18:18:55 +01:00
Laurent Destailleur (aka Eldy)
39293b79ff Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-02-05 18:16:40 +01:00
Laurent Destailleur (aka Eldy)
9fc78cd1b6 Fix regression 2025-02-05 18:16:09 +01:00
Laurent Destailleur (aka Eldy)
4f318a5efd FIX #32880 - Tags are using a special rendering. 2025-02-05 18:00:04 +01:00
Laurent Destailleur
0bb574297b
Merge pull request #32951 from hregis/fix_20_broken_feature
FIX missing company name if donation is linked to third party
2025-02-05 16:49:49 +01:00
Laurent Destailleur
34298f6c8c
Merge pull request #32947 from Easya-Solutions/18.0_fix-shipment-updated-message
FIX wrong message on update shipment
2025-02-05 16:39:11 +01:00