Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

515 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
83e7d5182e
fix incorrect phpdoc 2024-01-21 19:54:42 +01:00
Frédéric France
03e29c6960 fix param 2024-01-20 09:22:38 +01:00
Frédéric France
b3bcdeafe5 rename method 2024-01-18 18:55:53 +01:00
Laurent Destailleur
40f4ef9285 Close #27496 2024-01-14 12:10:09 +01:00
MDW
0395718521
Qual: Spelling htdocs/p[b-z]* (#27436) 
# Qual: Fix spelling htdocs/p[b-z]*

Highlight:

Probably fixes a bug:
htdocs/product/stock/replenish.php: empty(->variants->eabled) corrected to ...enabled.
'eabled' could not be found elsewhere in the codebase.
 2024-01-12 17:55:52 +01:00
Laurent Destailleur
910a541c60 Clean code 2024-01-09 13:08:22 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
4daacd3371 Fix with php-cs-fixer 2023-12-04 13:49:31 +01:00
Frédéric FRANCE
53c8a3acf8
clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
Laurent Destailleur
e6eb34a8db Fiw warnings: The private array ->status_short, ->statuts and 
->status_long are now array ->labelStatusShort and ->labelStatus
everywhere.
 2023-11-24 10:10:24 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Maxime Kohlhaas
c756aa8ad3
Fix tasklist extrafields (#26672) 
* Fix : value of extrafields not displayed in task list on a project

* Fix : icon to select columns was not displayed
 2023-11-17 16:39:49 +01:00
evarisk-micka
cf0c2882dc
NEW #26660 [Task] add hook on getNomUrl (#26662) 
* ADD #26660 [Task] hook on getNomUrl

* Update task.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-17 14:27:13 +01:00
Laurent Destailleur
4034164954 Fix warning 2023-11-17 02:17:12 +01:00
Eric
f175fc27f6
fix phpstan undef property (#26640) 2023-11-16 23:19:33 +01:00
Laurent Destailleur
2cfa9f8290 Debug v19 2023-10-17 15:43:56 +02:00
Laurent Destailleur
b8c8e903c2 Fix php8.2 warnings 2023-10-15 18:39:13 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Francis Appels
34b6d05bad Fix Générer intervention #26000. 
date and datehour already converted by setVarsFromFetchObj
 2023-09-23 15:57:23 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
020dd911de Debug v18 2023-08-15 13:51:17 +02:00
onhairech
facd492222
qodana fix 5 : missing returns (#25347) 
* qodana fix 5 : missing returns

* correcting return

* correcting a mistake
 2023-07-24 19:42:31 +02:00
Laurent Destailleur
a3e4d8fe3a Debug v18 2023-06-29 16:30:34 +02:00
Laurent Destailleur
b4c448a420 Debug v18 2023-06-29 15:54:09 +02:00
Frédéric France
1776fd55d1 doc 2023-06-27 21:46:52 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
20a9dc1951 Add field ref_ext in table of timespent 2023-05-16 22:33:32 +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
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
3999f87fd2 Debug v18 2023-04-21 14:41:56 +02:00
Laurent Destailleur
aea1f60c67 Debug v18 2023-04-10 01:46:30 +02:00
Laurent Destailleur
931c9fa7ca Look and feel v18 2023-04-08 00:30:21 +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
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
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
7b91eeb271 Fix phpcs 2023-03-13 16:37:27 +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
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
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
Florian HENRY
dbbb860fb4 feat: update invoice and invoice line on time spend #24102 2023-03-03 12:07:46 +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
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