ldestailleur
a4601686a6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2025-09-25 11:54:18 +02:00
lvessiller-opendsi
e818bf732d
FIX extra field list depend on parent list when editing a card ( #35165 )
2025-09-01 19:55:00 +02:00
Frédéric France
04b7fdd4c4
fix CI
2024-12-19 18:32:16 +01:00
Laurent Destailleur
5203652796
Merge pull request #32430 from Benoit-PASCAL/fix-fetch-action-linked-object
...
fix: fetch action linked object
2024-12-19 17:49:50 +01:00
Benoît PASCAL
425c23d28c
fix: fetch action linked object
2024-12-19 15:38:19 +01:00
alkaan
115323dec8
FIX : removes traces of <<<HEAD conflicts following the postponement of branch 13 modifications ( #32014 )
...
Co-authored-by: John Fleuret <john.fleuret@atgp.net >
2024-11-20 20:57:22 +01:00
Laurent Destailleur
b8533e1853
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-11-19 12:49:19 +01:00
Laurent Destailleur
753e5e535d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2024-11-19 12:47:14 +01:00
Mathieu Moulin
a602309e04
Fix user::load_previous_next_ref() with MULTICOMPANY_TRANSVERSE_MODE bad sql query (cartesian product replaced by INNER JOIN) ( #31946 )
2024-11-16 18:19:59 +01:00
Laurent Destailleur
d5004258db
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-07-25 18:00:55 +02:00
MaximilienR-easya
30f1d4f18b
Backport fix from develop ( #30421 )
2024-07-20 18:24:01 +02:00
Laurent Destailleur
b0b3d0e1e0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-10-01 15:43:40 +02:00
Regis Houssin
9eb4c93c1c
FIX add warning in the changelog
2023-09-27 09:44:58 +02:00
Regis Houssin
19e2f0c75c
FIX missing contact_id for the trigger
2023-09-27 08:54:54 +02:00
Regis Houssin
bcc97f8b9f
FIX wrong place of trigger delete
2023-09-26 23:49:21 +02:00
Laurent Destailleur
332ab226aa
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/langs/en_US/ticket.lang
2023-06-10 12:13:46 +02:00
Laurent Destailleur
9b8e564187
Update commonobject.class.php
2023-05-24 14:07:24 +02:00
Noé Courtier
d200dea905
FIX: default values were not set for specimen objects
2023-05-24 11:26:55 +02:00
Rémi Champlon
baa28e175d
indent
2023-02-20 16:47:01 +01:00
Rémi Champlon
aa60bd29c1
check link empty in switch
2023-02-20 16:39:03 +01:00
Rémi Champlon
b1a7c23daa
fix updateExtrafield option key empty set null
2023-02-01 11:20:44 +01:00
Laurent Destailleur
1a4cb5b4e2
FIX #22964 #23012
2023-01-26 02:06:40 +01:00
Laurent Destailleur
64de591770
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-12-14 10:20:47 +01:00
Aloïs Micard
285731200a
Add confirm_cancel action
2022-12-09 13:45:15 +01:00
Aloïs Micard
381b998413
Display blank td when action is confirm_valid
2022-12-09 11:45:09 +01:00
Laurent Destailleur
c28e6a46e2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/install/step5.php
2022-11-02 00:15:21 +01:00
kkhelifa
c4543eff73
FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element
2022-10-28 16:31:01 +02:00
Laurent Destailleur
31ef942c96
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-10-18 23:09:52 +02:00
Laurent Destailleur
c727ebd9dd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-10-18 21:12:04 +02:00
Laurent Destailleur
da3ae71a47
Try to fix rounding error
2022-10-18 13:32:18 +02:00
Laurent Destailleur
66c6d1927b
Fix duplicate invoice created
2022-10-11 16:46:08 +02:00
Laurent Destailleur
4e4b0e0039
FIX Duplicate creation of invoice when closing shipment linked to order
2022-10-07 22:44:20 +02:00
Laurent Destailleur
d39eca4d50
Fix phpcs
2022-09-20 16:36:29 +02:00
Laurent Destailleur
5afbfd0a0a
Try fix rounding
2022-09-20 16:20:00 +02:00
Laurent Destailleur
1162d858dd
Try fix rounding
2022-09-20 16:01:07 +02:00
Laurent Destailleur
61739cc338
FIX online signature, better error management.
2022-08-14 20:03:13 +02:00
NASDAMI Quatadah
793e95d88c
fixing bug (colspan should be int)
2022-06-09 14:04:32 +02:00
Laurent Destailleur
64a683c8e7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/projet/tasks/task.php
2022-05-31 14:33:19 +02:00
Florian HENRY
4e289741f9
fix: extrafields chkbxlst or checkbox or badly displayed in line object
2022-05-25 16:59:23 +02:00
Laurent Destailleur
34199cf0fb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
812298f740
Merge pull request #20945 from atm-maxime/fix_default_value_boolean
...
Fix default value boolean
2022-05-21 17:28:39 +02:00
Nicolas
d8a68d280e
FIX missing morecss for multiselectarray
2022-05-21 17:06:36 +02:00
Maxime Kohlhaas
9b2a543170
Fix phpcs too long line
2022-05-21 15:49:27 +02:00
Maxime Kohlhaas
4932f86a2d
Fix default value for boolean extrafield
2022-05-21 15:41:34 +02:00
Quentin-Seekness
726b899d30
FIX: Delete an extrafield where type is double
...
Found the bug on a propal's extrafield, it was impossible to delete a decimal extrafield. In updateExtraField() the $value stayed "" where it needed to be null.
The same issue can be found in insertExtraFields().
2022-04-29 10:45:08 +02:00
Laurent Destailleur
3ac268c200
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/holiday/card.php
htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Gauthier PC portable 024
9ffe82e259
FIX : originproductline array td identification
2022-04-07 10:32:23 +02:00
Laurent Destailleur
40ad12c3c3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-05 15:29:54 +02:00
Laurent Destailleur
8e4c89673a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2022-04-05 15:28:43 +02:00
Laurent Destailleur
2a48dd349e
Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5
2022-03-01 16:38:06 +01:00