Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

11027 Commits

Author SHA1 Message Date
Laurent Destailleur
00d9aa2378
Merge pull request #23296 from IC-Florian/FIX#23087 
FIX : Product list in setup.php in new Module
 2023-01-26 01:30:30 +01:00
Laurent Destailleur
3aec1289f8
Merge pull request #23618 from ATM-Consulting/FIX_16.0_fieldvalue_emailtemplate 
FIX : Empty FormSetup emailTemplate type IF empty fieldvalue
 2023-01-25 18:28:26 +01:00
GregM
934bcc72c4 update space 2023-01-25 17:34:57 +01:00
GregM
a3d4eb404d Fix contact firstname lastname extrafields 2023-01-18 17:36:05 +01:00
GregM
1d50acb3cf Fix fieldvalue emailtemplate 2023-01-18 12:10:58 +01:00
Laurent Destailleur
534db40d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 04:15:10 +01:00
Laurent Destailleur
8d4faf3530 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-27 11:19:11 +01:00
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Laurent Destailleur
a17c417205
Merge pull request #23018 from Easya-Solutions/14.0_fix-22837 
FIX #22837
 2022-12-27 00:26:52 +01:00
stickler-ci
56d05c09b2 Fixing style errors. 2022-12-22 13:52:39 +00:00
IC-Florian
2a68836375
New require for product in generateOutputField 2022-12-22 14:52:03 +01:00
Laurent Destailleur
f1d83b695a
Merge pull request #23166 from atm-lena/16.0_FIX_DeleteMOAndLinks 
Delete MO :  object's links must be deleted
 2022-12-17 01:46:42 +01:00
atm-lena
eff01374b1 Change place of deleteobjectlinked in deletecommon function 2022-12-15 15:09:50 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +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
atm-lena
95f437b45c deleteObjectLinked() in deleteCommon() function 2022-12-12 10:05:44 +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
antonin_tdj
ef065967ed
Add $langs->load('errors') before radioError 
Add $langs->load('errors') before radioError
 2022-11-30 10:44:10 +01:00
stickler-ci
87526194c5 Fixing style errors. 2022-11-29 19:44:44 +00:00
antonin_tdj
b713f645d4
Update extrafields.class.php error message 
adapt error message for radio buttons
 2022-11-29 20:35:43 +01:00
VESSILLER
ad07fdfd79 FIX #22837 2022-11-27 01:06:40 +01:00
Nicolas Domenech
b98eaa4d45 #FIX: #22509 default value on integer fields don't retrieve by setSaveQuery 2022-11-26 01:01:22 +01:00
Nicolas Domenech
f2f58e434e fix: can't use parameter morcss in select task because parameter is overwrite 2022-11-25 12:16:34 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Laurent Destailleur
1e54e695b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:00:59 +01:00
ATM-Nicolas
3d9b2a1676 FIX : SQL request parenthesis 2022-11-22 15:32:37 +01:00
Laurent Destailleur
1e3e26e7f9 Fix use of the lowmemorydump for batch of backup 2022-11-16 14:00:52 +01:00
Laurent Destailleur
2f3cc7ce59 FIX Backup using the low memory mode 2022-11-15 19:02:56 +01:00
Laurent Destailleur
e512c9aeee Fix trans 2022-11-07 14:04:01 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
 2022-11-02 00:19:23 +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
Laurent Destailleur
8a599ec610 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:36 +02:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02: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
bf794cacc0
Merge pull request #22615 from marc-dll/14.0_FIX_hidden_extrafields_update 
FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request
 2022-10-25 19:43:41 +02:00
Gauthier PC portable 024
d9f067eabb FIX : travis & stickler feedbacks 2022-10-24 09:46:41 +02:00
Gauthier PC portable 024
02d9c9897a FIX : bug on selected value for select_bom() function 2022-10-20 16:27:20 +02:00
Gauthier PC portable 024
06646d4540 FIX : php doc 2022-10-20 15:56:32 +02:00
Gauthier PC portable 024
c3fb0fde85 FIX : we must be able to select only bom of a specific product + several fixes on select_bom() function 2022-10-20 15:53:03 +02:00
Laurent Destailleur
69ca6c02d7 Add debug for ldap 2022-10-20 12:16:12 +02:00
Laurent Destailleur
b562ab9948 Fix debug module eventorganization 2022-10-18 23:33:11 +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
Marc de Lima Lucio
82ca472245 FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request 2022-10-18 10:50:21 +02:00
Laurent Destailleur
159628be56 Fix the quick filter on MO 2022-10-17 15:54:48 +02:00
Laurent Destailleur
1ceb7dfb84
Merge pull request #22522 from ATM-Consulting/FIX_16.0_computed_extrafields_not_shown_if_no_other_extrafields 
FIX 16.0 - computed extrafields are not displayed if the object has no classic extrafields
 2022-10-15 10:40:17 +02:00
Laurent Destailleur
d30d6dfe34 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-13 14:34:36 +02:00
Laurent Destailleur
409b137ba7 Try a better fix for #22535 #22536 2022-10-13 14:31:08 +02:00
Laurent Destailleur
8f5c05f577 Add price in local format in json response 2022-10-13 12:22:16 +02:00
Regis Houssin
a14a546906 FIX wrong var typo 2022-10-13 07:48:52 +02:00
Laurent Destailleur
77898ab456 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 11:52:33 +02:00
Laurent Destailleur
6eecb93f05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-11 17:01:59 +02:00
Laurent Destailleur
66c6d1927b Fix duplicate invoice created 2022-10-11 16:46:08 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
4e4b0e0039 FIX Duplicate creation of invoice when closing shipment linked to order 2022-10-07 22:44:20 +02:00
atm-florian
40923c6af5 FIX 16.0 - computed extrafields are not displayed if the object has no "classic" extrafields 2022-10-07 13:13:59 +02:00
Laurent Destailleur
68c0188969 Revert "FIX: Preview button position on documents list (case when the file is too long)" 
This reverts commit 88b5594af3.
 2022-10-04 14:17:57 +02:00
Laurent Destailleur
150f4c45d8 FIX default value for partnership status 2022-09-29 15:20:19 +02:00
Laurent Destailleur
ec29a6a608 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-28 21:18:22 +02:00
Laurent Destailleur
8048322b65
Merge pull request #22435 from hregis/fix_csrf_and_lost_parameter_value 
FIX CSRF + lost value of constant after use save button
 2022-09-28 20:08:04 +02:00
Regis Houssin
aafecb6d2b FIX missing the management of a constant in the Ticket config 2022-09-27 17:08:08 +02:00
Laurent Destailleur
d532ad1c8e Fix test ldap 2022-09-27 16:53:15 +02:00
Regis Houssin
d4ad93a94d TODO Add a visible option for captcha for ticket 2022-09-27 16:33:54 +02:00
lmarcouiller
4b8583095f Merge branch '15.0' of github.com:Dolibarr/dolibarr into develop_v15#1 2022-09-26 10:41:40 +02:00
Laurent Destailleur
877c57f6b8
Merge pull request #22281 from atm-lena/16.0_FIX_getunitFromCode_AddFilterType 
Function getUnitFromCode : add filter by type of unit
 2022-09-25 14:19:33 +02:00
Laurent Destailleur
c5c85fad9d Fix warning 2022-09-22 14:55:16 +02:00
Laurent Destailleur
cb7db080cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-21 01:21:11 +02:00
Laurent Destailleur
a470eb79a8 Revert "FIX: Preview button position on documents list (case when the file is too long)" 
This reverts commit 88b5594af3.
 2022-09-20 23:15:32 +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
stickler-ci
c1e6ac6326 Fixing style errors. 2022-09-20 13:47:24 +00:00
atm-lena
8a032a560a FIX 2022-09-20 15:40:55 +02:00
Laurent Destailleur
dd4be90525 Fix warning 2022-09-20 14:15:41 +02:00
atm-lena
7ff40f5f16 Merge branch '16.0' of github.com:Dolibarr/dolibarr into 16.0_FIX_getunitFromCode_AddFilterType 2022-09-20 10:31:31 +02:00
Laurent Destailleur
6ddc32febc FIX Bad backtopage and CSRF on link for ticket message 2022-09-19 20:27:01 +02:00
Laurent Destailleur
f1a90cbbb4 Fix missing set cursor on cancel button of confirmation page 2022-09-16 15:06:08 +02:00
Laurent Destailleur
c6499c5219 Fix cursor to wait 2022-09-16 13:19:06 +02:00
Laurent Destailleur
662384ad7d Fix error message in LDAP test 2022-09-16 01:16:59 +02:00
lmarcouiller
9b51586209 fix style error 2022-09-15 14:13:27 +02:00
lmarcouiller
4437506ef9 Fix : datetime extrafield behaviour 2022-09-15 13:53:52 +02:00
atm-lena
91bde420d4 Clean 2022-09-15 11:57:02 +02:00
atm-lena
1c14c61064 Function getUnitFromCode : add filter by type of unit 2022-09-15 11:55:08 +02:00
Laurent Destailleur
e0f76fd8f9 Fix modify cursor on submit after a confirmation. 2022-09-15 11:53:52 +02:00
Laurent Destailleur
90dbb93388 Try fix rounding 2022-09-14 18:51:07 +02:00
Laurent Destailleur
8f7f104806 Fix test on MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND 2022-09-14 18:34:13 +02:00
Laurent Destailleur
3a078ec77d Fix type of var 2022-09-14 18:12:05 +02:00
Laurent Destailleur
8ac625f03b FIX reading of trackid in emailcollector (when on recipient suffix) 2022-09-12 10:26:20 +02:00
Laurent Destailleur
295b850ae8 Fix missing include 2022-09-11 22:25:03 +02:00
Laurent Destailleur
a11a33a804 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-11 22:21:18 +02:00
Laurent Destailleur
a87fbd3f06 Bad type 2022-09-08 23:58:38 +02:00
Laurent Destailleur
8bf8beb898 Debug module ticket 2022-09-01 10:54:20 +02:00
kamel
88b5594af3 FIX: Preview button position on documents list (case when the file is too long) 2022-08-31 10:03:58 +02:00
Laurent Destailleur
d70c70a5fe FIX email not visible into combo list 2022-08-30 01:33:51 +02:00
Laurent Destailleur
138e087737 Fix phpcs 2022-08-27 11:45:02 +02:00
Laurent Destailleur
b78e9e7e54
Merge pull request #21894 from atm-lena/16.0_AddForceCombo_SelecttDolUserFunction 
Add forcecombo parameter to select dol user function
 2022-08-26 19:12:22 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00