Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
140,250 Commits 36 Branches 190 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

1385 Commits

Author SHA1 Message Date
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
9d8af9c530 Fix restore option to have non samples stats 2023-05-17 00:04:37 +02:00
Laurent Destailleur
0ec45022ea Merge pull request #24767 from daraelmin/daraelmin-stats-adh-by-status 
NEW : Uniformize member stats in boxes and index
 2023-05-16 23:22:22 +02:00
Laurent Destailleur
72b5f02d26 Merge pull request #24768 from daraelmin/daraelmin-stats-adh-by-tags 
Fix link, label and badge color status in box_members_by_tags
 2023-05-15 23:51:09 +02:00
Laurent Destailleur
b72cba5c14 Merge pull request #24775 from Hystepik/develop#3 
fix : php 8.1 warnings
 2023-05-15 23:21:24 +02:00
Laurent Destailleur
9972ab2f44 CSS 2023-05-15 20:53:31 +02:00
hystepik
979359526e fix : php 8.1 warnings 2023-05-15 16:05:04 +02:00
daraelmin
130a84e63d Fix link for member tag in box 2023-05-14 23:10:25 +02:00
daraelmin
c9c973acc2 Fix label and badge color status in box_members_by_tags 
Pending members were listed as green instead of orange

Validate member short label was used insteaded of pending member short label
 2023-05-14 22:33:25 +02:00
daraelmin
6abf459da5 Fix copyright 2023-05-14 16:57:44 +02:00
daraelmin
059589656e Merge branch 'Dolibarr:develop' into daraelmin-stats-adh-by-status 2023-05-14 12:17:41 +02:00
daraelmin
31c03ad7d8 Merge branch 'develop' into daraelmin-stats-adh-by-status 2023-05-14 12:17:05 +02:00
Laurent Destailleur
789d54b747 Debug v18 2023-05-12 21:37:55 +02:00
Frédéric FRANCE
0ca6ab84a3 fix hidden condition 2023-05-10 13:55:41 +02:00
Laurent Destailleur
5a3d271829 Fix sanitize 2023-05-06 11:46:11 +02:00
Laurent Destailleur
166f8039fd NEW Add widget of open opportunities 2023-05-05 15:10:52 +02: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
Laurent Destailleur
57a9ef35ae NEW Implement MAIN_ACTIVATE_FILECACHE on bithday widget 2023-05-05 13:21:54 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
Laurent Destailleur
c891196b5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-04-25 21:02:01 +02:00
Laurent Destailleur
8cd8b5f401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-23 22:12:06 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Noé Courtier
0a4d37dbcb FIX: Use max parameters of widget graph product distribution 2023-04-18 16:49:07 +02:00
Laurent Destailleur
1bab847278 NEW Can set the page "List of opportunities" as landing page 2023-04-08 03:08:17 +02:00
Frédéric FRANCE
f28405f7a9 fix warning 
Undefined variable $now in htdocs\core\boxes\box_members_by_tags.php:222
 2023-03-21 13:54:47 +01:00
Laurent Destailleur
76ab7136f2 Clean code 2023-03-19 15:22:21 +01:00
Laurent Destailleur
b7c242c210 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-17 20:54:18 +01:00
Laurent Destailleur
f39bf7a43c Debug v17 2023-03-17 19:09:31 +01:00
Mickaël 'lastmikoi' FALCK
59b02a9f49 FIX #24138 Fix box_birthdays SQL for postgres 
PR #21631's implementation causes issues with PostgreSQL and potentially
other stricter RDBMSes, indeed doing an ORDER BY using a function is not
supported.

In this fix we're computing the day of each user birthday and
employment day in the SELECT columns, and use those columns as a sorting
key.
 2023-03-17 18:48:25 +01:00
Laurent Destailleur
2ebf152884 Merge pull request #24238 from lastmikoi/issue-24138-birthday-sql-error 
FIX #24138 Fix box_birthdays SQL for postgres
 2023-03-17 18:45:13 +01:00
Laurent Destailleur
1a89a7ea5c FIX #24138 FIX #24238 2023-03-17 18:16:30 +01:00
Mickaël 'lastmikoi' FALCK
f136cee0f2 FIX #24138 Fix box_birthdays SQL for postgres 
PR #21631's implementation causes issues with PostgreSQL and potentially
other stricter RDBMSes, indeed doing an ORDER BY using a function is not
supported.

In this fix we're computing the day of each user birthday and
employment day in the SELECT columns, and use those columns as a sorting
key.
 2023-03-16 17:03:28 +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
9769fe54a2 NEW : element time integration code 2023-03-08 11:00:58 +01:00
Laurent Destailleur
bd066b3211 Debug modulebuilder 2023-03-07 15:51:27 +01:00
Frédéric FRANCE
2daa9b2dba user hasRight 2023-02-27 10:34:28 +01:00
Laurent Destailleur
b0b1e8d327 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-27 03:40:12 +01:00
Alexandre SPANGARO
d7d8653603 FIX Members Index - Missing colspan & language key on widget 2023-02-25 08:20:31 +01:00
Laurent Destailleur
4ebb39febe Fix #huntrd875d1a2-7205-4b2b-93cf-439fa4c4f961 2023-02-20 13:18:03 +01:00
Laurent Destailleur
6ab68be4b3 Fix warning 2023-02-20 02:20:43 +01:00
Laurent Destailleur
fdcce8d263 Add nonce on javascript tags 2023-02-18 15:10:05 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Frédéric FRANCE
08838d4deb clean code 2023-02-13 13:16:27 +01:00
Frédéric FRANCE
a7c5140fd6 clean code 2023-02-12 12:05:14 +01:00
Frédéric FRANCE
daba310395 clean code 2023-02-12 11:39:10 +01:00
Frédéric FRANCE
6144b6e99d add two widgets 2023-02-12 09:54:57 +01:00
Laurent Destailleur
8675abeec8 Merge pull request #23342 from daraelmin/daraelmin-box-adh-tags 
NEW Add widget box_members_by_tags.php
 2023-01-26 00:55:42 +01:00
Laurent Destailleur
dd4a9a94c7 Merge pull request #23633 from Hystepik/develop#1 
Fix : php 8.1 warnings and dolibarr log
 2023-01-23 02:24:01 +01:00
Frédéric FRANCE
6ab5c79c6b box_birthday_member doesn't give same date than box_birthday 2023-01-21 11:46:11 +01:00