Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
135,578 Commits 36 Branches 189 Tags
8e12d3fd17d61675b51c49b05c6a910a6ea1f3ed
Commit Graph

472 Commits

Author SHA1 Message Date
Laurent Destailleur
cbb458486b Debug v20 2024-06-06 09:27:25 +02:00
Lucas Marcouiller
678c76b80e Fix merge time spent task (#29834) 
* Fix time spent task

* Update task.class.php

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-04 14:46:01 +02:00
Laurent Destailleur
3f13d944f5 Clean code 2024-06-03 19:19:52 +02:00
Frédéric FRANCE
d0830b3159 fix phpstan (#29602) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix travis

* fix phpstan

* fix phpstan

* fix phan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

fix phpstan

fix phpstan

fix phpstan

fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix travis

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-05-05 00:34:19 +02:00
Laurent Destailleur
8db9b30fbb Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-27 04:07:00 +02:00
Can Arslan
74bc383fb0 FIX: TASK_CREATE Trigger (#29483) 
TASK_CREATE Trigger should be called after insertExtraFields (like in TASK_MODIFY trigger) otherwise TASK_CREATE Trigger will be without projet_task_extrafields record
 2024-04-27 03:59:37 +02:00
Laurent Destailleur
75103c251b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-04-24 21:10:06 +02:00
Laurent Destailleur
090d079641 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-24 21:08:47 +02:00
Laurent Destailleur
0693fa9149 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-24 21:08:18 +02:00
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
Can Arslan
a45b62b2d6 FIX: duplicate error check (#29433) 
we are checking if there is an error on previous line
 2024-04-24 15:17:44 +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
d4b7332c76 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-22 14:24:14 +02:00
Laurent Destailleur
6303bceecd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-22 14:19:59 +02:00
Laurent Destailleur
c454729f90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-22 14:19:30 +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
Lucas Marcouiller
232800d776 NEW feature to merge 2 tasks (#29214) 
* first push select not saved

* add working merge

* ass merge of contact for task

* fix typo

* add of merge timespent

* Fix integration error + use of good SelectTasks

* fix precommit

* Fix CI

* fix CI

* fix bad change

* fix to make merge only an update

* remove useless field update

* fix empty array

* fix CI

* fix unused code

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-04-08 20:50:16 +02:00
Laurent Destailleur
6ef81a05dc typo 2024-04-04 19:13:12 +02:00
Laurent Destailleur
a2ec7400eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-03-28 10:55:44 +01:00
MDW
d245dab56b Fix PhanTypeMismatchReturnNullable by setting variable 2024-03-20 21:58:36 +01:00
MDW
10b260a31d Fix PhanTypeSuspiciousStringExpression 2024-03-19 02:44:02 +01:00
Laurent Destailleur
d3262ace71 Fix phpunit error due to regression in removing the $conf 2024-03-16 23:22:12 +01:00
MDW
38e7d389a9 Fix PhanTypeMismatchDefault by updating default to null 2024-03-15 14:53:05 +01:00
MDW
a408288ba1 Fix & enable PhanPluginUnknownClosureParamType 
# Fix & enable PhanPluginUnknownClosureParamType

Typing of anonymous functions to fix this notice.
Optimised some minor things.
 2024-03-14 22:42:26 +01:00
MDW
f4e1026e7d Qual: Fix PHPdoc to match parent 2024-03-11 22:21:08 +01:00
Frédéric FRANCE
e00a9816f8 fix phpstan (#28727) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-03-09 14:48:06 +01:00
Frédéric FRANCE
fba15178eb all initAsSpecimen return int (#28577) 
* all initAsSpecimen return int

* all initAsSpecimen return int

* all initAsSpecimen return int
 2024-03-02 16:38:35 +01:00
Frédéric FRANCE
b1f01b1e70 fix phpstan (#28571) 2024-03-02 12:40:59 +01:00
Frédéric FRANCE
991b39c8a0 fix phpstan (#28422) 2024-02-25 22:14:55 +01:00
Laurent Destailleur
739efc8086 Clean code 2024-02-22 12:23:12 +01:00
Laurent Destailleur
626edcac77 Add phpunit test on tasks 2024-02-20 01:17:00 +01:00
lamrani abdelwadoud
2c8a2e5f61 New functionality for add cronjob (#28282) 2024-02-20 00:44:09 +01:00
Laurent Destailleur
4dbb745df8 Clean table name 2024-02-20 00:41:31 +01:00
Lucas Marcouiller
ae1ee52bd2 Fix mysql fatal error (#28276) 
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-02-19 16:38:40 +01:00
Frédéric FRANCE
3a45d510ac fix task.class.php (#28206) 
* fix task.class.php

* Update list.php

* Update list.php
 2024-02-18 22:58:37 +01:00
Laurent Destailleur
6e8786241c Fix regression 2024-02-16 18:18:17 +01:00
Laurent Destailleur
8dc8f67c31 Rename status for a better consistency with other modules 2024-02-16 13:32:40 +01:00
evarisk-micka
010257eaa2 FIX #26920 replace fk_statut by status (#27930) 
* FIX use status instead of fk_statut

* FIX replace fk_statut by status

* FIX keep old fk_statut field in case it is used by hook or trigger

* FIX select fk_statut as status and fill both with obj->status

* Update list.php

* Update task.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-16 13:23:23 +01:00
Lucas Marcouiller
82faea5167 Fix some php warnings and errors (#28138) 
* Fix some php warnings and errors

* fix array

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-13 11:26:40 +01:00
Laurent Destailleur
421e1f5586 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-02-08 02:20:52 +01:00
Laurent Destailleur
e950bdde26 Merge pull request #27687 from frederic34/dol_print_error_db 
fix param
 2024-01-22 00:03:06 +01:00