Commit Graph

3667 Commits

Author SHA1 Message Date
Laurent Destailleur
403d6137e8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-07 02:44:27 +02:00
Laurent Destailleur
99b595a807 Fix typo 2023-04-06 13:29:24 +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
Laurent Destailleur
39fa93486d Debug v17 2023-04-04 01:56:44 +02:00
Laurent Destailleur
8898a1a432 Debug ajax tooltip 2023-04-03 19:51:40 +02:00
Laurent Destailleur
53032fd6ed Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-01 15:09:30 +02:00
Laurent Destailleur
254e785c47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-04-01 15:06:15 +02:00
Marc de Lima Lucio
96d23fac5f FIX: project referent elements list: conf to hide tasks was flipped 2023-03-31 16:57:19 +02:00
Laurent Destailleur
2ab510d746 Clean code. $hookmanager must be global and never be erased 2023-03-26 17:59:28 +02:00
Regis Houssin
b9aeadf566 FIX avoid phpunit error 2023-03-24 17:30:00 +01:00
Regis Houssin
4240ac18f3 FIX task have the same entity of project 2023-03-24 16:18:14 +01:00
Regis Houssin
7a12ba9c20 FIX missing "multidir_output" for project sharing (Multicompany) 2023-03-24 16:07:34 +01:00
Laurent Destailleur
ec43a8626e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-03-18 14:37:48 +01:00
Laurent Destailleur
dc2cb7fbb3 NEW Add dropdown button actions (example on Create button on project) 2023-03-18 14:10:23 +01:00
Laurent Destailleur
8e5a235470
Merge pull request #24074 from ATM-Consulting/FIX_16.0_arraytotal_extrafield
FIX 16.0 total line for extrafields on list if totalizable
2023-03-18 11:06:05 +01: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
Laurent Destailleur
7b91eeb271 Fix phpcs 2023-03-13 16:37:27 +01:00
Laurent Destailleur
2660948778 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-12 22:08:50 +01:00
Laurent Destailleur
925b47d1b2 Fix css 2023-03-11 21:32:51 +01:00
Laurent Destailleur
7dcd050854
Merge pull request #24158 from atm-gauthier/NEW/element_time_code_integration
NEW : element time integration code + sql
2023-03-11 19:16:15 +01:00
Laurent Destailleur
7de853403a
Merge pull request #24143 from Quentin-Seekness/patch-7
Search all on projects
2023-03-10 22:50:33 +01:00
stickler-ci
23f32933b6 Fixing style errors. 2023-03-10 18:42:22 +00:00
atm-gauthier
fd41ab77c3
Merge branch 'develop' into NEW/element_time_code_integration 2023-03-10 19:27:43 +01:00
Laurent Destailleur
9670747483
Merge pull request #24110 from FHenry/dev_timespent_invoice_and_line_can_be_updated
feat: update invoice and invoice line on time spend #24102
2023-03-10 11:36:14 +01:00
Gauthier PC portable 024
532bcddfb7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/element_time_code_integration 2023-03-09 09:30:07 +01:00
Gauthier PC portable 024
b7e633a00b Merge branch 'NEW/element_time_integration_sql' of github.com:atm-gauthier/dolibarr into NEW/element_time_code_integration 2023-03-09 09:28:00 +01:00
Laurent Destailleur
3f264989ce
Merge pull request #23906 from FliyFly/qodanaincompatible
Fix (qodana)
2023-03-08 13:21:14 +01:00
Gauthier PC portable 024
87f9052f87 Merge branch 'NEW/element_time_code_integration' of github.com:atm-gauthier/dolibarr into NEW/element_time_code_integration 2023-03-08 11:59:55 +01:00
Gauthier PC portable 024
5064ee178a FIX : travis + stickler 2023-03-08 11:59:32 +01:00
stickler-ci
e6a5cd9461 Fixing style errors. 2023-03-08 10:08:08 +00:00
Gauthier PC portable 024
9769fe54a2 NEW : element time integration code 2023-03-08 11:00:58 +01:00
Laurent Destailleur
a92081cf43 Debug Kanban views 2023-03-07 22:04:40 +01:00
jpb
4291560577 fix search_project_user 2023-03-07 17:36:40 +01:00
Quentin-Seekness
61fd3d3c25
Search all on projects
Search all using client code and thirdparty name alias
2023-03-07 10:10:19 +01:00
Florian HENRY
5dce64c811 review 2023-03-05 10:41:32 +01:00
Florian HENRY
bea2371bc1 review 2023-03-05 10:40:31 +01:00
Laurent Destailleur
8ebd27cb25
Merge pull request #24112 from frederic34/morepictos
add pictos
2023-03-04 15:09:25 +01:00
hystepik
f497f4d6e9 Fix : php 8.0 warnings 2023-03-03 16:45:21 +01:00
Frédéric FRANCE
5ec36ead7f add pictos 2023-03-03 15:46:49 +01:00
Frédéric FRANCE
8ed361b917 add pictos 2023-03-03 14:36:34 +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
Laurent Destailleur
12bd795afc Work on Kanban view 2023-03-01 20:13:21 +01:00
GregM
235641e2df FIX total line for extrafields 2023-02-28 15:46:42 +01:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
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