Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
148,250 Commits 36 Branches 189 Tags
develop
Commit Graph

150 Commits

Author SHA1 Message Date
ThomasNgr-OpenDSI
acc3a47272 NEW add fields usage_opportunity, usage_task, usage_bill_time for project import (#35301) 2025-09-12 02:29:43 +02:00
Frédéric FRANCE
255300a29e test fix phan (#33879) 
* test fix phan

* test fix phan

* test fix phan

* test fix phan

* test fix phan
 2025-04-16 19:55:44 +02:00
ldestailleur
7fc8136362 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-16 14:50:09 +01:00
ldestailleur
415c38ed6b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-16 14:32:33 +01:00
Regis Houssin
8150cc6159 FIX wrong ODT path for multicompany 2025-02-13 18:20:47 +01:00
Laurent Destailleur (aka Eldy)
58134e840d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2025-01-30 13:14:15 +01:00
Laurent Destailleur (aka Eldy)
12da2ba814 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-30 13:12:44 +01:00
Laurent Destailleur (aka Eldy)
3c7327a457 Missing notes 2025-01-29 12:35:27 +01:00
Frédéric France
44bfbb7f4a fix phpstan 2025-01-11 09:24:21 +01:00
Frédéric FRANCE
000173c7b9 fix phpstan (#31075) 
* 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 phpstan

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-23 01:59:14 +02:00
Laurent Destailleur
aa3a4fbf52 QUAL Clean code 2024-08-15 16:53:49 +02:00
Vincent de Grandpré
b0cd32bf68 NEW Implementing Billable tasks on projects using new attribute "billable" (#30092) 
* Implementing Billable task function on projects using new attribute in #30014

* added billable to Task->initAsSpecimen()

* default billable to 1 in initAsSpecimen

* set billable to 1 in ProjectTest::testTaskCreate

* Moving attribut usage in usage_bill_time condition of project

* PPDoc

* fusion

* pre-commit + typo

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-03 03:29:05 +02:00
lamrani abdelwadoud
2c8a2e5f61 New functionality for add cronjob (#28282) 2024-02-20 00:44:09 +01:00
Laurent Destailleur
4795c40601 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-01-19 15:36:53 +01:00
Laurent Destailleur
be9e94a4a2 Fix duplicate trnaslation key 2024-01-19 10:45:00 +01:00
MDW
89004f7e03 Qual: Spelling htdocs/core (#27491) 
Highlights:
- initialY in pdf_standard.modules.php was unused
  - remove (otherwise -> initially) (+same in other file)
 2024-01-13 19:48:20 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Laurent Destailleur
daa1ac9e60 NEW option MAIN_ACTIVATE_FILECACHE to cache widgets 2023-05-05 14:22:32 +02:00
Laurent Destailleur
e0ef2870a4 NEW: Add widget "The next upcoming events" 2023-05-05 13:42:38 +02:00
Gauthier PC portable 024
9769fe54a2 NEW : element time integration code 2023-03-08 11:00:58 +01:00
Laurent Destailleur
8d5a3c6bae Fix import task of project was not possible without import projet 2022-12-05 15:31:05 +01:00
Frédéric France
c7ee2f413c min php version is 7.0 2022-09-27 20:48:47 +02:00
Philippe GRAND
de97379f3f FIX php8 compatibility 2022-08-28 14:05:07 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
6308b700d5 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-05-01 20:47:54 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2022-04-29 17:27:12 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Florian HENRY
bae73b9a52 disabled module on inactive 2021-09-01 15:16:11 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Florian HENRY
63a47112ae new: #18162 2021-07-16 11:14:30 +02:00
Alexandre SPANGARO
3669c374c2 Uniformize information on modules 2021-03-20 13:55:43 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Frédéric FRANCE
7860ffa28e update phpmin version 2021-02-06 13:48:31 +01:00
Laurent Destailleur
f21a4e8aed Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +01:00
lmarcouiller
c7a31b2458 new widget funnel of prospection 2020-12-02 14:42:56 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Adrien Raze
c9833c501d SQL + insertion champs dans box 2020-09-10 11:10:06 +02:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
ce09ec8805 Fix phpcs 2020-02-18 23:35:45 +01:00