Commit Graph

3276 Commits

Author SHA1 Message Date
Laurent Destailleur
98e61dc40d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-07 17:29:24 +01:00
Laurent Destailleur
0eb0ee5bb1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-06 16:52:06 +01:00
Gauthier PC portable 024
e7d31a821c FIX : hierarchyme and not hierachyme 2023-01-05 15:41:57 +01:00
Laurent Destailleur
a892ef56ab
Merge pull request #23422 from Dolibarr/fix_fatal_error_on_task_list_time_to_bill
FIX #23420 : wrong check on $search_categ value causing FATAL ERROR
2023-01-05 14:47:43 +01:00
Théo David
665fd9cc0e FIX : wrong check on $search_categ value causing fatal error 2023-01-05 10:46:08 +01:00
Laurent Destailleur
dc1c31c948 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 21:00:57 +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
1681674cdf
Update card.php 2022-12-21 20:45:11 +01:00
Braito
55b51b94f1
php 8 warning 2022-12-20 10:13:47 +01:00
Laurent Destailleur
dac8d5c952
Merge pull request #23219 from sebastien-prudhomme/fix-23019
FIX #23019 Impossible to add task times to an existing draft invoice
2022-12-14 18:38:53 +01:00
stickler-ci
70b6b3d82d Fixing style errors. 2022-12-14 15:21:42 +00:00
Gauthier PC portable 024
1a16e41ce3 FIX : Can't see all time spent by all user 2022-12-14 16:04:35 +01:00
Sébastien Prud'homme
ed89005941 Fix #23019 Impossible to add task times to an existing draft invoice 2022-12-14 11:45:40 +01:00
stickler-ci
d679a32155 Fixing style errors. 2022-12-14 09:36:25 +00:00
Gauthier PC portable 024
b906619ce1 FIX : methods declaration (backport fix 67b9a7dc07) 2022-12-14 10:31:11 +01:00
Milen Karaganski
811e24fd7c Change to define unit price from timespent data instead from the user hourly rate 2022-12-10 21:15:00 +02:00
Milen Karaganski
ee7e394ebf FIX|Fix [#23075]
Wrong invoice unit price when billing Project task spent time
2022-12-08 20:22:41 +02:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
antonin_tdj
59ec20f549
Fix #20685 User Id not transmitted on Api addTimeSpent
Fix #20685 User Id not transmitted on Api addTimeSpent

The User ID will be transmitted to the API call (if 0 then, the user will be selected from API key)
2022-11-25 23:44:32 +01:00
Laurent Destailleur
2a13165218 Clean useless join 2022-11-15 22:12:53 +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
Regis Houssin
765e619cee FIX avoid unnecessary multiple calculation (#22637) 2022-10-20 14:47:55 +02:00
stickler-ci
71bae4f94b Fixing style errors. 2022-10-18 09:43:55 +00:00
jpb
6050f60704 add loadRoleMode on getlinearray 2022-10-18 11:36:17 +02:00
ksar
95ce5c19dd
FIX #22482
Preserve \r\n strings in task notes
2022-10-06 14:36:53 +02:00
Regis Houssin
4f6cf3f067 FIX missing check if category module is enabled 2022-09-23 11:46:55 +02:00
Laurent Destailleur
f3f3b952e9 Fix label 2022-09-19 18:57:39 +02:00
Laurent Destailleur
e0e9701830 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-15 18:30:42 +02:00
Laurent Destailleur
094c2c3027 Fix condition on a field 2022-09-15 01:02:49 +02:00
Atm-Gregr
7d4c7e0f6b stickler 2022-09-13 14:28:57 +02:00
Atm-Gregr
4f9c273c64 retours 2022-09-13 14:19:28 +02:00
Atm-Gregr
527cfadf0f nl2br like on the card 2022-09-12 16:31:00 +02:00
Atm-Gregr
3c5f3f7b85 fix 2022-09-12 16:28:06 +02:00
Laurent Destailleur
860d0ebe08 FIX #22164 2022-09-10 01:16:56 +02:00
lmarcouiller
db6d345e54 Fix #21810 : Broken statistics in project module 2022-08-31 15:31:00 +02:00
Laurent Destailleur
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
2022-07-22 17:43:35 +02:00
atm-lena
46075188b2 Tasks List Search : several same lines 2022-07-21 15:59:46 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
abd3f272fa Fix backtopage after a cancel 2022-07-12 19:17:44 +02:00
Laurent Destailleur
6e4d4b5b0d css 2022-07-07 21:42:32 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00