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
121,782 Commits 35 Branches 179 Tags 1.7 GiB
9861b50ede
Commit Graph

3686 Commits

Author SHA1 Message Date
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
Laurent Destailleur
3065b9ca6a Clean code 2023-04-27 21:15:27 +02:00
stickler-ci
034f1167fd Fixing style errors. 2023-04-27 18:51:33 +00:00
mc2contributor
a9775a4413
API endpoint to delete timespent record 2023-04-27 11:49:18 -06:00
mc2contributor
b7b322e661
API endpoint to update timespent record 2023-04-27 11:46:39 -06:00
Laurent Destailleur
0cf4fca331 Fix look and feel v17 2023-04-27 18:00:53 +02:00
Laurent Destailleur
8a92d7f905 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-27 14:03:59 +02:00
Gauthier PC portable 024
bb350d062b FIX : deletion of a line of time spent (backport e3aa438d2a) 2023-04-26 10:25:08 +02:00
Frédéric FRANCE
5f5fa38561 Merge remote-tracking branch 'upstream/develop' into use_ismodenabled 2023-04-21 15:16:08 +02:00
Laurent Destailleur
3999f87fd2 Debug v18 2023-04-21 14:41:56 +02:00
Laurent Destailleur
aa459721b7 Invert PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA into 
PROJECT_SHOW_OPEN_PROJECTS_LIST_ON_PROJECT_AREA
 2023-04-21 13:36:35 +02:00
stickler-ci
69f6685971 Fixing style errors. 2023-04-20 18:23:40 +00:00
antonin_tdj
1410565b83
Fix ref_client on Project Overview for propale 
The ref_customer in the propal object is name ref_client. 
I just added another check if nothing is found.
 2023-04-20 19:55:31 +02:00
Frédéric FRANCE
97dcae2339 use isModEnabled 2023-04-20 19:11:45 +02:00
Frédéric FRANCE
057407554a use isModEnabled 2023-04-19 14:06:16 +02:00
Frédéric FRANCE
a38a303e1c use isModEnabled 2023-04-18 20:23:34 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
Laurent Destailleur
96cb5fac9c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-13 13:08:59 +02:00
Laurent Destailleur
9821833d0d Clean code 2023-04-12 18:18:55 +02:00