2
0
forked from Wavyzz/dolibarr
Commit Graph

377 Commits

Author SHA1 Message Date
Laurent Destailleur
07dedd3d2c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-04-24 21:06:46 +02:00
Laurent Destailleur
8d5dd565a6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-04-24 21:05:22 +02:00
Laurent Destailleur
7259195caf Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-24 21:04:48 +02:00
Laurent Destailleur
3723ae025f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2024-04-24 21:01:44 +02:00
Laurent Destailleur
2d971f3a05 Fix regression 2024-04-24 21:00:38 +02:00
Eric
c8ef530d52 note_private and note_public was forgotten too (#29440)
* note_private and note_public was forgotten

* sql error missing comma

* sql error missing comma for rang=
2024-04-24 15:11:27 +02:00
Laurent Destailleur
79353a6cbb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-04-22 14:17:06 +02:00
Laurent Destailleur
98fc0033f5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-04-22 14:16:37 +02:00
Laurent Destailleur
8e0369440f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-22 14:16:18 +02:00
Laurent Destailleur
2768d80b9b FIX Regression #29340 2024-04-14 03:15:49 +02:00
Laurent Destailleur
459ff72732 FIX Regression #29340 2024-04-14 02:56:17 +02:00
Eric
2a93168d48 object tasks: priority is fetch but not updated and others... (#29340)
* priority is fetch but not updated and others...

* insert too
2024-04-14 00:52:01 +02:00
jpb
b5c0fda8a9 add a test for updating date on task update in tab time consummed project. 2023-05-12 15:00:48 +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
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
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
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
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-16 20:35:29 +01:00
Laurent Destailleur
2a13165218 Clean useless join 2022-11-15 22:12:53 +01:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02: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
jpb
6050f60704 add loadRoleMode on getlinearray 2022-10-18 11:36:17 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
stickler-ci
e7242788b9 Fixing style errors. 2022-08-02 09:00:15 +00:00
Gauthier PC portable 024
da196b868c NEW : conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line 2022-08-02 10:49:34 +02:00
HENRY Florian
770abb73f6 Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
3481a4652a Merge pull request #21264 from fboitel/fboitel-dev-scrutinizer-009
BUG FIX Attribute datee doesn't exist on class Task
2022-06-17 14:50:11 +02:00
Faustin
aa2b96fb48 Added deprecated attribute datee in class Task 2022-06-15 14:10:21 +02:00
stickler-ci
73977f8a84 Fixing style errors. 2022-06-15 12:09:40 +00:00
Faustin
e5ec06ab53 Added deprecated attribute datee in class Task 2022-06-15 14:09:00 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
f247bda226 Attribute datee doesn't exist on class Task 2022-06-14 10:54:12 +02:00
lmarcouiller
2a89e396fe Fix #20878 : improper use of dol_move 2022-06-01 15:17:19 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
88a9b8c201 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:08 +02:00
kamel
aee6f408b2 FIX: Set datec when add time spent on a project task 2022-05-11 09:30:39 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
John BOTELLA
7d3030aa8e Fix fatal error for usage in tpl 2022-05-03 12:31:30 +02:00
Florian HENRY
c951e681c2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-04-13 09:31:07 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
kamel
d43b180115 FIX - Move delete task time trigger position 2022-03-29 10:26:38 +02:00
Regis Houssin
4479ba8015 FIX missing translation keys 2022-03-26 08:32:20 +01:00