Commit Graph

386 Commits

Author SHA1 Message Date
Gauthier PC portable 024
bb350d062b FIX : deletion of a line of time spent (backport e3aa438d2a) 2023-04-26 10:25:08 +02: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
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
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
ksar
95ce5c19dd
FIX #22482
Preserve \r\n strings in task notes
2022-10-06 14:36:53 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +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
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
Laurent Destailleur
e991c614d3 Debug v16 2022-06-14 14:48:15 +02:00
Laurent Destailleur
862ca7cf04 Debug v16 2022-06-14 14:39:32 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Laurent Destailleur
2ad7c0df74
Merge pull request #21178 from Quatadah/fix19860
FIX  #19860
2022-06-09 12:51:19 +02:00
stickler-ci
fb86cea3fc Fixing style errors. 2022-06-09 10:09:49 +00:00
NASDAMI Quatadah
8a48cd5989 Fixing bug 2022-06-09 12:05:23 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project
NEW: Separate read-only and adding time on projects
2022-05-08 19:50:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Florian HENRY
477aa4cc09 Merge branch 'dev_new_project_upgrade_external_user_perms_project' of github.com:FHenry/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:19:27 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
kamel
e17bbdebcf NEW - Add hooks on project task time page 2022-03-29 10:16:06 +02:00
HENRY Florian
77d8025d86
Merge branch 'develop' into dev_new_project_upgrade_external_user_perms_project 2022-03-01 08:54:43 +01:00
priojk
c201ff211f Fix #20141 generation of intervention
When an intervention card was created from the times spent on tasks in a project, the task label was wrong in
the descriptions on the intervention card
2022-02-24 11:10:46 +01:00
Laurent Destailleur
4ac62773ae Fix permissions on deletion on time spend line 2022-01-21 16:22:59 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
e4c4ef14ef Fix td balance 2021-12-21 23:52:01 +01:00
Laurent Destailleur
4855a97b21 Fix phpunit 2021-12-20 20:07:29 +01:00
Laurent Destailleur
02317f1d95 Fix nav lose filter 2021-12-20 18:12:08 +01:00
Laurent Destailleur
26d30be518 FIX list on time spent when no param provided was wrong. 2021-12-20 17:50:59 +01:00
Laurent Destailleur
4cfec658bc css 2021-11-25 14:11:18 +01:00
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist
fix warnings in ticket list
2021-10-24 12:31:57 +02:00
Frédéric FRANCE
d240a9f774
fix warnings in ticket list 2021-10-24 09:59:30 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Frédéric FRANCE
7c449892bb
fix display 2021-10-22 00:19:10 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00