2
0
forked from Wavyzz/dolibarr
Commit Graph

582 Commits

Author SHA1 Message Date
Laurent Destailleur
d02c615f40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-16 15:14:22 +02:00
Laurent Destailleur
4634c0ccd9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-15 15:05:29 +02:00
Laurent Destailleur
4e58a34c78 Fix css 2023-09-15 15:04:40 +02:00
Laurent Destailleur
6c5bef8294 FIX #25894 2023-09-13 18:16:31 +02:00
Florian HENRY
060b27285b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-07 13:21:36 +02:00
Laurent Destailleur
b65b8d7bcb FIX Navigation to/from a project from page of projects of a thirdparty 2023-09-06 15:08:54 +02:00
Florian HENRY
d0fb3839c3 reveiw 2023-09-05 19:15:43 +02:00
HENRY Florian
97042001f6 Merge branch 'develop' into dev_change_notetaskivoice 2023-08-28 15:14:42 +02:00
Laurent Destailleur
020dd911de Debug v18 2023-08-15 13:51:17 +02:00
Laurent Destailleur
1e443e060c Debug v18 2023-07-22 16:17:06 +02:00
NextGestion
5c5d9392c3 Merge branch 'develop' into dolibarr_fixbugs 2023-05-02 17:09:02 +01:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
Florian HENRY
683c4c2a70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-04-24 10:59:35 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
ab037cb5e9 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-10 17:15:26 +02:00
Laurent Destailleur
eb187052e8 Fix column alignment/balance 2023-04-10 11:44:19 +02:00
Laurent Destailleur
0fb03fdc2d Clean code 2023-04-08 01:43:21 +02:00
Laurent Destailleur
ab6a6b87f6 Debug v18 2023-04-05 17:31:58 +02:00
Laurent Destailleur
220d404d62 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-04 19:40:05 +02:00
Laurent Destailleur
454372bb4e Fix show description of project 2023-04-04 02:05:05 +02:00
Florian HENRY
aeb0f9b92e merge from develop 2023-04-02 12:51:06 +02:00
Florian HENRY
47c86eff53 merge from develop 2023-04-02 12:37:06 +02:00
Jyhere
ecfa7f1676 FIX: remove obsolete preg_replace for removing commat at the beginning... needed to work 2023-03-16 14:58:44 +01:00
atm-gauthier
fd41ab77c3 Merge branch 'develop' into NEW/element_time_code_integration 2023-03-10 19:27:43 +01:00
Gauthier PC portable 024
9769fe54a2 NEW : element time integration code 2023-03-08 11:00:58 +01:00
Florian HENRY
bea2371bc1 review 2023-03-05 10:40:31 +01:00
Florian HENRY
e81231ed28 feat: update invoice and invoice line on time spend #24102 2023-03-03 12:18:31 +01:00
Florian HENRY
dbbb860fb4 feat: update invoice and invoice line on time spend #24102 2023-03-03 12:07:46 +01:00
Florian HENRY
b658b9b1d3 WIP 2023-03-03 11:18:19 +01:00
Florian HENRY
be877ffb4b WIP 2023-03-03 10:15:11 +01:00
Florian HENRY
d46ff73804 On going 2023-03-03 09:34:24 +01:00
Florian HENRY
5399e8b60e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-03-03 08:52:44 +01:00
Florian HENRY
18fae5e10a test 2023-02-28 09:18:29 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
4c6b8d7a20 Fix navigation into timespent 2023-02-23 22:14:10 +01:00
Laurent Destailleur
ed60d4fe22 Debug v18 2023-02-23 21:40:56 +01:00
Frédéric FRANCE
03e8ee0e6d use user->hasRight 2023-02-14 23:00:15 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Florian HENRY
c54ab940ac fix dol_concatdesc 2023-02-14 08:36:35 +01:00
Florian HENRY
571caa7a6c NEW: Invoice time from task, make task note better display in invoice line 2023-02-10 11:11:52 +01:00
Laurent Destailleur
3ffc97bbf4 Merge pull request #23737 from fboitel/NEW-checkbox-left-column
New checkbox left column on all lists
2023-02-04 16:32:45 +01:00
Laurent Destailleur
9fb08b5a0a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-31 21:28:59 +01:00
Laurent Destailleur
36cf05318b Debug v17 2023-01-31 21:17:06 +01:00
Faustin
4168f0be01 checkbox colum on left for task/time.php list 2023-01-31 12:11:37 +01:00
stickler-ci
9dd6045412 Fixing style errors. 2023-01-04 17:06:16 +00:00
Gauthier PC portable 024
c84d17eced FIX : filter only if t.task_duration checked 2023-01-02 16:58:33 +01:00
Gauthier PC portable 024
3ed5edc003 NEW : search on time spent duration range 2023-01-02 16:21:14 +01:00
Laurent Destailleur
e06bad5112 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-21 21:15:00 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +01:00
Laurent Destailleur
3b87aadc48 Debug v17 2022-12-16 12:59:47 +01:00