Commit Graph

4465 Commits

Author SHA1 Message Date
Frédéric FRANCE
740ac26277 use user hasRight 2023-06-14 19:54:16 +02:00
Frédéric France
0cb70110eb use user hasRight 2023-06-12 20:10:42 +02:00
Maxime Kohlhaas
c7304271fa Fix #23806 use dictionary position to display contact type list 2023-06-11 00:42:29 +02:00
Laurent Destailleur
c76d7c0c19 Merge pull request #24938 from FHenry/17_fix_display_project_bugdet_field
fix: display budget field on load project
2023-06-09 09:36:56 +02:00
Florian HENRY
59496f1066 review: always display budget field and fix bad quote 2023-06-08 23:32:59 +02:00
Laurent Destailleur
88175964f9 Fix regression 2023-06-08 10:35:06 +02:00
Laurent Destailleur
c7e9993733 Merge branch 'develop' into fix_element 2023-06-07 20:53:46 +02:00
Laurent Destailleur
da85ee4406 Merge pull request #24909 from mc2contributor/filterChildProjects
Filter child projects out of project list.
2023-06-07 20:44:10 +02:00
Laurent Destailleur
f12327cb0b Merge pull request #24956 from Hystepik/develop#1
Fix : php 8.1 warnings
2023-06-07 20:03:58 +02:00
Frédéric France
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
Prit Patel
7c7ab04d44 Filter child projects out of project list. 2023-06-05 08:53:54 -06:00
hystepik
40fe1a5d90 Fix : php 8.1 warnings 2023-06-05 16:08:59 +02:00
Laurent Destailleur
89e378bc78 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 19:07:04 +02:00
Laurent Destailleur
60b5280d85 FIX #24918 2023-06-04 15:26:52 +02:00
Laurent Destailleur
6efa2ecfbb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 03:34:49 +02:00
Laurent Destailleur
7f9c34a935 Fix more complete than #24938 2023-06-04 02:33:53 +02:00
Laurent Destailleur
ebfe632efe Debug v18 2023-06-03 15:33:46 +02:00
Florian HENRY
57defe4382 fix: display budget field on load 2023-06-01 17:02:10 +02:00
Roger Dueck
31b548291a Fix undefined and invalid access issues 2023-05-29 10:21:40 -06:00
Laurent Destailleur
481fc79721 Debug v18 - Fix extrafields visibility in customreports 2023-05-24 00:26:30 +02:00
Laurent Destailleur
fe9521b6b2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-21 17:34:34 +02:00
Laurent Destailleur
421f7ecff4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-21 11:36:42 +02:00
Laurent Destailleur
6350df54e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-21 11:22:36 +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
39da668060 Merge pull request #24739 from noec764/15_FIX_Tasks_event_not_displayed
FIX: Task events not displayed
2023-05-16 22:57:35 +02:00
Laurent Destailleur
20a9dc1951 Add field ref_ext in table of timespent 2023-05-16 22:33:32 +02:00
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
hystepik
46012a6520 fix : php 8.1 warnings 2023-05-16 15:36:27 +02:00
Laurent Destailleur
8def870558 Merge pull request #24751 from atm-jpb/fix_update_date_on_task_in_tab_consummed_time
FIX : add a test for updating date on task update in tab time consummed pro…
2023-05-12 19:11:00 +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
607fb89b38 Clean code 2023-05-12 14:52:47 +02:00
Laurent Destailleur
1d22be092d Fix lang trans 2023-05-12 14:51:22 +02:00
Laurent Destailleur
ca21aef394 Fix typo 2023-05-12 14:28:52 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Noé Courtier
07bec30c32 FIX: Task events not displayed 2023-05-11 11:10:33 +02:00
Noé Courtier
bc42bdef49 FIX: wrong colspan for tasks list 2023-05-11 09:25:07 +02:00
Laurent Destailleur
f88f5cd7c6 Fix css 2023-05-11 02:09:39 +02:00
Laurent Destailleur
166f8039fd NEW Add widget of open opportunities 2023-05-05 15:10:52 +02:00
Laurent Destailleur
ad195f53f0 Debug v18 2023-05-04 22:17:06 +02:00
NextGestion
5c5d9392c3 Merge branch 'develop' into dolibarr_fixbugs 2023-05-02 17:09:02 +01:00
Laurent Destailleur
c630253fda Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-02 05:28:32 +02:00
Laurent Destailleur
a1ba425765 Fix warnings 2023-05-01 18:12:59 +02:00
Laurent Destailleur
e2ec34e1e5 Clean code 2023-05-01 14:33:08 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed Merge pull request #24635 from VMR-Global-Solutions/develop
API add / fix filter on extrafields in index()
2023-04-28 20:02:09 +02:00
mc2contributor
8e0e134dc5 Add "@return void" to satisfy CI check 2023-04-28 10:20:48 -06:00
mc2contributor
7a8fd37a4a Fix issues identified by CI in pull request. 2023-04-28 10:07:46 -06:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
VMR Global Solutions
926aa6fec7 API add / fix filter on extrafields in index()
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
2023-04-28 09:31:33 +02:00