Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,919 Commits 36 Branches 189 Tags
cb15d8c7beb0db960202c0207fe164e65e59349c
Commit Graph

1007 Commits

Author SHA1 Message Date
stickler-ci
5b40a4a210 Fixing style errors. 2022-12-26 21:37:33 +00:00
daraelmin
ffae98085b New box box_members_by_tags.php 2022-12-26 22:36:05 +01:00
daraelmin
61536455c2 Comment 2022-12-23 14:25:52 +01:00
daraelmin
b1e5c92455 Clean code 2022-12-23 14:22:07 +01:00
daraelmin
0506f028c9 Add MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH in widget and graphh 2022-12-23 14:21:23 +01:00
daraelmin
a8673a18d1 Merge branch 'daraelmin-stats-adh-by-status' of https://github.com/daraelmin/dolibarr into daraelmin-stats-adh-by-status 2022-12-22 22:54:16 +01:00
daraelmin
d107cc4c0c Fix label status 2022-12-22 22:53:57 +01:00
stickler-ci
be34e7d53a Fixing style errors. 2022-12-22 21:53:30 +00:00
daraelmin
0889c9f89b Merge branch 'develop' into daraelmin-stats-adh-by-status 2022-12-22 22:43:21 +01:00
daraelmin
9501d844d0 Merge branch 'daraelmin-stats-adh-by-status' of https://github.com/daraelmin/dolibarr into daraelmin-stats-adh-by-status 2022-12-22 22:37:11 +01:00
daraelmin
26370ff1c8 Remove With rollup 2022-12-22 22:35:35 +01:00
stickler-ci
6436306634 Fixing style errors. 2022-12-22 15:25:09 +00:00
daraelmin
e16994bcff Fix add not used active member type 2022-12-22 16:23:18 +01:00
Lamrani Abdel
061ef892b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into KanbanViewForAdherent 
resolve the conflict in project.lib
 2022-12-22 14:49:13 +01:00
Laurent Destailleur
7e05743edc Merge branch 'develop' into kanbanViewSubscribe 2022-12-22 14:28:57 +01:00
daraelmin
0ae8809ae2 Use db->ifsql instead of case when 2022-12-22 12:40:12 +01:00
lamrani abdelwadoud
7833efe613 Merge branch 'develop' into kanbanAdherenType 2022-12-22 11:16:51 +01:00
Laurent Destailleur
b281924f03 Merge pull request #23279 from frederic34/fixwarnings 
fix warnings
 2022-12-21 20:01:48 +01:00
Laurent Destailleur
4c47e29a2d Update adherent.class.php 2022-12-21 19:38:49 +01:00
stickler-ci
46ac466d3c Fixing style errors. 2022-12-21 16:08:34 +00:00
Frédéric FRANCE
690562c22e add numbering modules for members 2022-12-21 16:43:38 +01:00
Frédéric FRANCE
3680f20465 use user->hasRight 2022-12-21 08:41:19 +01:00
daraelmin
f1f510cf60 Copyright 2022-12-20 19:40:58 +01:00
stickler-ci
21e22ee990 Fixing style errors. 2022-12-20 18:06:23 +00:00
daraelmin
01e9d1bf4b NEW : Uniformize stat adh in boxes and index 2022-12-20 18:38:01 +01:00
Frédéric FRANCE
9ecf353342 fix warnings 2022-12-20 17:57:19 +01:00
Lamrani Abdel
a849283e37 update return type 2022-12-20 12:41:54 +01:00
Lamrani Abdel
aed3f841bc New View mode for Adherent Type list 2022-12-20 11:27:55 +01:00
Lamrani Abdel
0c75e5bb2d mode Kanban for subscription list 2022-12-19 15:19:18 +01:00
Lamrani Abdel
abd5a86f34 mode Kanban for subscription list 2022-12-19 15:19:12 +01:00
Lamrani Abdel
f90b887ec2 NEW mode view for list adherent 2022-12-19 13:48:08 +01:00
Laurent Destailleur
7510ed68a8 Debug v17 2022-12-09 16:34:32 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Laurent Destailleur
c22d9f282a Merge pull request #23016 from inovea-conseil/FIX_product_type9 
FIX product_type 9
 2022-11-30 00:41:35 +01:00
Laurent Destailleur
7884216197 Merge pull request #23003 from rycks/14_fix_api_status_on_delete 
fix #22766: better API response HTTP code
 2022-11-26 10:26:21 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:43:09 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:21:51 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
IC-Ilies
b5ab1f612c FIX#19828 2022-11-25 22:29:35 +01:00
fboitel
00f5a2ddc8 Merge branch 'Dolibarr:develop' into FIX-SECURITY-Fail2ban-public-pages 2022-11-24 19:10:35 +01:00
Faustin
6e4eeb8b3c Limit member subscription on public page by ip adress 2022-11-24 14:26:50 +01:00
Laurent Destailleur
dd50854b05 Fix log 2022-11-23 18:58:17 +01:00
Laurent Destailleur
4d11b5db31 Fix error management 2022-11-23 18:52:43 +01:00
Laurent Destailleur
b42b0ef841 Fix error management 2022-11-23 18:49:59 +01:00
Laurent Destailleur
fb2b4ea388 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 17:07:36 +01:00
Laurent Destailleur
d0ac102bd0 Debug v17 2022-11-23 17:07:11 +01:00
Laurent Destailleur
1a8dbd75ea Fix update socialnetworks 2022-11-23 16:59:40 +01:00