Commit Graph

3667 Commits

Author SHA1 Message Date
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
c2f79dfd7a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-23 22:15:44 +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
Laurent Destailleur
7ec32d2458 Fix phpunit 2023-02-23 21:28:58 +01:00
stickler-ci
af4228064d Fixing style errors. 2023-02-23 07:33:16 +00:00
pratushraj
d326e59beb issue #24014 2023-02-23 13:00:31 +05:30
FLIO
29e56ab3cf fix (qodana) edit error and merge develop to be update 2023-02-21 17:51:24 +01:00
hystepik
e75186f6bc Fix : php 8.0 warnings 2023-02-21 16:14:14 +01:00
Laurent Destailleur
40d9d7481b Debug v18 2023-02-21 02:12:20 +01:00
Laurent Destailleur
75cddd8c09 Debug kanban 2023-02-21 00:54:00 +01:00
Laurent Destailleur
659718b41f
Merge pull request #23970 from lamrani002/kanbanProject
NEW mode Kanban for project module
2023-02-20 18:14:10 +01:00
Lamrani Abdel
d36c8ab0f0 fix problem in class project 2023-02-20 16:56:02 +01:00
Lamrani Abdel
4d232af62b new mode kanban for projects 2023-02-20 16:23:12 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
6da47ea49b Fix qodana 2023-02-20 02:33:44 +01:00
Laurent Destailleur
3b8794dfb6 Debug v17 2023-02-20 02:08:04 +01:00
Laurent Destailleur
d89ccaeaad Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-19 18:18:38 +01:00
Laurent Destailleur
9966d605a2 Debug v17 2023-02-19 17:20:51 +01:00
Laurent Destailleur
6224414b0d Debug v17 2023-02-19 16:55:36 +01:00
Laurent Destailleur
2cafd2cbc4 Debug v17 2023-02-19 16:42:01 +01:00
Laurent Destailleur
c3da1554a7 Debug v17 2023-02-19 16:28:04 +01:00
Laurent Destailleur
93927cceff Debug v17 2023-02-19 16:12:28 +01:00
Laurent Destailleur
56add74e71 Debug v17 2023-02-19 13:58:57 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
07ef94debf Fix filter on contract list 2023-02-19 02:29:48 +01:00
Laurent Destailleur
6b12020e7a Look and feel v18 2023-02-18 20:49:38 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Frédéric FRANCE
8765e00e00 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-16 21:27:56 +01:00
Laurent Destailleur
2397fb0125
Merge pull request #23912 from frederic34/fixuserrights
use user->hasRight
2023-02-16 21:12:04 +01:00
Frédéric FRANCE
c1882425db fix tooltip 2023-02-15 22:26:16 +01:00
Frédéric FRANCE
26452c9644 fix tooltip project 2023-02-15 22:02:45 +01:00
Laurent Destailleur
11488a1f8d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-15 18:26:29 +01:00
Laurent Destailleur
c06f0e0b20 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-15 18:23:22 +01:00
Laurent Destailleur
ec1f6de6ac Fix message 2023-02-15 18:23:02 +01:00
Laurent Destailleur
6db1c1cd2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-15 18:22:06 +01:00
Laurent Destailleur
32d27887b1 Fix message for profit calculation 2023-02-15 18:11:25 +01:00
Laurent Destailleur
d04043f3d8 FIX Profit calculation on project preview tab. 2023-02-15 18:04:23 +01:00
Laurent Destailleur
1b925ec53f FIX Profit calculation on project preview tab. 2023-02-15 17:59:27 +01:00
Laurent Destailleur
6c2d08b9f8 FIX Profit calculation on project preview tab. 2023-02-15 17:57:19 +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
FLIO
156922fc51 Fix (qodana) Incompatible return type 2023-02-14 14:09:56 +01:00
Laurent Destailleur
b136004eaf
Merge pull request #23843 from FliyFly/qodanareturn
Fix (qodana)
2023-02-13 18:26:03 +01:00
Laurent Destailleur
19bfb021e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-13 13:51:35 +01:00
Laurent Destailleur
af028bae63
Merge pull request #23762 from rycks/17_fix_whitepage_on_project_list
fix whitepage if modCategorie is not enabled
2023-02-10 21:25:44 +01:00
Laurent Destailleur
8299501800 Fix subrequest inside a loop 2023-02-10 16:14:32 +01:00
Laurent Destailleur
02475369e6 Fix bad link 2023-02-10 12:58:49 +01:00
Laurent Destailleur
3e7879c886 Debug v17 2023-02-10 11:00:07 +01:00
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
Frédéric FRANCE
9fe920b2a9 deprecate method send_an_email 2023-02-08 21:45:46 +01:00
FLIO
cd289ca8ac fix(qodana) fix function comment wrong return 2023-02-08 19:09:05 +01:00
Laurent Destailleur
f1c15e1714
Merge pull request #23295 from FliyFly/scrutinizernewproject
Fix(scrutinizer)
2023-02-08 16:13:00 +01:00
Frédéric FRANCE
019802ec33 add ajax tooltip on project 2023-02-07 22:12:47 +01:00
Frédéric FRANCE
df411abe41 add ajax tooltip on task 2023-02-07 14:07:27 +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
1f195a3be5 Fix #yogosha14963 2023-02-04 14:04:25 +01:00
Eric Seigne
a07916858f fix whitepage if modCategorie is not enabled 2023-02-02 21:36:41 +01:00
Laurent Destailleur
af61006b8b Add missing call of hook doActions in projet/contact.php 2023-02-02 21:11:52 +01:00
FLIO
4c5bcd02b7 fix (scrutinizer) remove comments and create function send an email TODO 2023-02-01 23:31:39 +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
Laurent Destailleur
67bf4a3ec0 Debug v17 2023-01-31 20:45:32 +01:00
Faustin
4168f0be01 checkbox colum on left for task/time.php list 2023-01-31 12:11:37 +01:00
Christian Humpel
665acb45cf filter on extrafields 2023-01-30 11:53:29 +01:00
Christian Humpel
0279f1ec44 filter on extrafields 2023-01-29 23:05:39 +01:00
Laurent Destailleur
0f475783de Enhance method getKanbanView 2023-01-18 22:27:52 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
56e77b9601 Fix default field on project list 2023-01-17 12:31:53 +01:00
Laurent Destailleur
3bac52d053
Merge pull request #23143 from milenmk/massaction-delete-project-tasks
NEW|New [Bulk delete Project tasks]
2023-01-13 23:29:19 +01:00
Laurent Destailleur
ff395153aa
Merge pull request #23473 from lamrani002/kanbanForTaskActivity
NEW KanbanView for list of task/Activity
2023-01-11 20:57:42 +01:00
Laurent Destailleur
c5a83972ca Fix return warnings 2023-01-10 23:47:47 +01:00
Lamrani Abdel
1c997eaabd KanbanView for list of taskActivity 2023-01-09 16:56:55 +01:00
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
75d9793145 Fix virtual card feature 2023-01-07 14:34:30 +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
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +01:00
Laurent Destailleur
27792fe1ad Fix qodana 2023-01-04 18:34:54 +01:00
stickler-ci
9dd6045412 Fixing style errors. 2023-01-04 17:06:16 +00:00
Laurent Destailleur
f0d3353d9c
Merge pull request #23390 from atm-gauthier/NEW_search_on_time_spent_duration_range
New search on time spent duration range
2023-01-04 17:48:59 +01:00
Laurent Destailleur
566fb52fb8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-04 15:38:57 +01:00
Laurent Destailleur
eed3cdd9cc Debug v17 2023-01-04 15:10:53 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01: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
0f763d2606 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 15:01:24 +01:00
Laurent Destailleur
1934db2dd1 Debug v17 2022-12-31 14:37:33 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
15c05d9b7d Fix warnings 2022-12-31 12:39:42 +01:00
Laurent Destailleur
f816587cfb Fix warning 2022-12-30 19:28:05 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
Laurent Destailleur
c886bad8b6 Fix warning 2022-12-28 17:00:28 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Laurent Destailleur
dbc5f5742f Clean code 2022-12-28 12:05:30 +01:00
Laurent Destailleur
ad184c4644 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-28 04:01:11 +01:00
Laurent Destailleur
d68a737f14 FIX "Only variables can be passed by reference" 2022-12-28 03:14:27 +01:00
Laurent Destailleur
120dd6319f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-28 02:44:28 +01:00
Braito
6dcb6405f3
php 8 warning fk_user_cloture 2022-12-27 16:44:19 +01:00
Laurent Destailleur
597c9acb4f
Merge branch '17.0' into patch-3 2022-12-27 14:50:09 +01:00
Braito
11bcececf6
update 2022-12-27 10:09:47 +01:00
Laurent Destailleur
7c7f0a3322 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-26 23:59:45 +01:00
Laurent Destailleur
9b22d1a8a1 WIP Work on dol_openinpopup 2022-12-26 15:14:55 +01:00
stickler-ci
f189d71a37 Fixing style errors. 2022-12-26 08:53:27 +00:00
Braito
edf79382bf
php 8 warnings test and testnew 2022-12-26 09:47:03 +01:00
Frédéric FRANCE
a08d84b995 fix code 2022-12-23 14:11:13 +01:00
Frédéric France
637fc95265 clean code 2022-12-22 22:29:24 +01:00
Laurent Destailleur
357b69a90b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 01:11:03 +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
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
50d4b6c2b2 css 2022-12-21 21:00:44 +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
Lamrani Abdel
1c9a554706 New mode view for projects 2022-12-21 13:28:39 +01:00
Laurent Destailleur
e97104fcaa Fix selection of opp status 2022-12-20 23:53:22 +01:00
Laurent Destailleur
4dc9583607 css 2022-12-20 23:50:20 +01:00
Laurent Destailleur
41f1c20d4c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-20 23:25:59 +01:00
Laurent Destailleur
b67ae6d172 Fix selection of opp status 2022-12-20 23:13:47 +01:00
Braito
55b51b94f1
php 8 warning 2022-12-20 10:13:47 +01:00
Laurent Destailleur
3b87aadc48 Debug v17 2022-12-16 12:59: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
Laurent Destailleur
e603fdcfe5 FIX calculation of unit price for timespen invoice mode 1 line per user 2022-12-14 11:34:56 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +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
Laurent Destailleur
74e580ce69 Debug v17 2022-12-10 18:49:16 +01:00
Laurent Destailleur
279e161b95
Merge pull request #23152 from atm-lena/develop_fixsearchlistaliasname
FIX Search Alias / Company
2022-12-10 16:33:58 +01:00
Laurent Destailleur
f8d5a0f3ed
Merge pull request #23156 from defrance/patch-252
fix : forgotten hook on list
2022-12-10 16:28:46 +01:00
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01: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
Charlène Benke
06c0a50ff5
forgotten hook on list 2022-12-08 16:33:04 +01:00
stickler-ci
0db8a0b831 Fixing style errors. 2022-12-08 09:34:48 +00:00
Milen Karaganski
52ec95d7bf Removed unnecessary fetchAll() method from project class 2022-12-07 18:08:10 +02:00
Milen Karaganski
5770d01c75 Fix syntax error 2022-12-07 17:57:43 +02:00
Milen Karaganski
f0f66327b9 Fix syntax error 2022-12-07 17:47:01 +02:00
Milen Karaganski
6b6cfb1339 Add mass action to clone selected tasks to another project 2022-12-07 16:57:22 +02:00
Milen Karaganski
ccf40855d8 Removed "Clone" option from massactions list (work in progress) 2022-12-07 14:04:54 +02:00
Milen Karaganski
3f2367dc16 NEW|New [Bulk delete Project tasks]
Massaction to delete multiple tasks from tab Taks of Project
2022-12-07 13:49:54 +02:00
atm-lena
9fef8b7dc2 FIX Search List Alias Name 2022-12-07 10:11:57 +01:00
Laurent Destailleur
8d5a3c6bae Fix import task of project was not possible without import projet 2022-12-05 15:31:05 +01:00
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Laurent Destailleur
5026de62f7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-01 17:48:29 +01:00