Commit Graph

1143 Commits

Author SHA1 Message Date
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
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
6e27abaed9 FIX redirect to payment page when membership payment mode forced 2021-11-27 17:19:16 +01:00
Laurent Destailleur
66d9964861 Clean code 2021-11-27 16:19:12 +01:00
Philippe GRAND
1c41735b11 fix bad path 2021-11-17 10:07:05 +01:00
Regis Houssin
7324375caa FIX missing rename function 2021-11-12 13:15:40 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_add_ldap_hash_type_select
2021-11-12 10:10:04 +01:00