lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

949 Commits

Author SHA1 Message Date
Laurent Destailleur
e5f17a8db7
Merge pull request #23257 from lamrani002/kanbanViewSubscribe 
New Kanban view for subscribe list
 2023-01-04 17:50:30 +01:00
Laurent Destailleur
ba6374e6be Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 15:31:00 +01:00
Laurent Destailleur
8d4e973e00 Fix warnings 2023-01-03 15:29:49 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
f6e8d13e1f FIX stats page for donation 2022-12-27 21:04:48 +01:00
Laurent Destailleur
edad39a93b FIX stats page for donation 2022-12-27 21:02:21 +01:00
daraelmin
5d09076a8f
Doc 2022-12-26 22:56:26 +01:00
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
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
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
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
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
Laurent Destailleur
4890a2ada3 Debug v17 2022-11-04 11:37:28 +01:00
Laurent Destailleur
a52de14003 Debug hrm module 2022-10-20 22:56:07 +02:00
Laurent Destailleur
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
babf1e0e27 Fix doc 2022-10-17 01:55:57 +02:00
Laurent Destailleur
96bf7016c7 Fix filter on membership status and graph 2022-10-13 04:25:20 +02:00
Philippe GRAND
e0ca87516f update code toward php8 compliance 2022-09-24 14:35:45 +02:00
Laurent Destailleur
b69031e979 Fix php8.1 2022-09-21 03:23:03 +02:00
Philippe GRAND
9027e2b96b update code toward php8 compliance 2022-09-09 10:28:00 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
a67008f7e9
Merge pull request #22058 from grandoc/16.0 
FIX : bug#22057
 2022-09-03 11:38:36 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
00da52ef8c fix php8 warnings 2022-08-31 22:12:25 +02:00
ptibogxiv
9d57680d82
FIX double fix 2022-08-31 20:14:54 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Laurent Destailleur
dc08b96444 Fix phpcs 2022-08-31 17:17:43 +02:00
ptibogxiv
30475a8ce6 Fix updating member 
need functions2.lib.php for clean_url()
 2022-08-31 15:41:25 +02:00
stickler-ci
a7529c171d Fixing style errors. 2022-08-30 15:33:18 +00:00
ptibogxiv
0f4c59689d
Fix updating member 
need functions2.lib.php for clean_url()
 2022-08-30 17:26:18 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
ptibogxiv
65629121f8 update 2022-08-07 10:14:40 +02:00
Anthony Berton
cfc9819e49 FIX - strlower for email 2022-07-28 15:13:13 +02:00
Laurent Destailleur
fd0bac05d9
Update adherent_type.class.php 2022-07-11 11:37:29 +02:00
Laurent Destailleur
abcfbca77f
Update adherent_type.class.php 2022-07-11 11:36:59 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
54e572b94f Fix 2022-05-21 10:25:20 +02:00
Laurent Destailleur
a55fe58d4c
Merge pull request #20921 from homer8173/patch-30 
FIX scrutinizer
 2022-05-21 01:40:37 +02:00
stickler-ci
3780718bcf Fixing style errors. 2022-05-20 17:23:54 +00:00
Norbert Penel
0533fd4762
scrutinizer 
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/adherents/type_translation.php?orderField=path&order=asc&honorSelectedPaths=0
 2022-05-20 19:21:47 +02:00
Philippe Grand
1cefe479e7
Update adherent_type.class.php 2022-05-20 17:20:41 +02:00
stickler-ci
80e0e5b987 Fixing style errors. 2022-05-20 15:03:36 +00:00
Philippe GRAND
61d9e48821 fix : The property other does not seem to exist on AdherentType. 2022-05-20 15:48:25 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
Laurent Destailleur
bedb08df50 Clean and debug online payment code 2022-04-08 15:15:55 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Frédéric FRANCE
dad73b755e
fix merge 2022-02-15 18:46:41 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
85d158d302
Update adherent.class.php 2022-02-15 11:09:07 +01:00
Laurent Destailleur
053b402202 Fix for notes standardization #19835 2022-01-23 19:20:13 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00