Commit Graph

3348 Commits

Author SHA1 Message Date
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
lmarcouiller
eb38875119 Fix : PHP 8.1 warnings 2022-07-20 16:35:51 +02:00
David Beniamine
3bace74378 Add search on member nature morphy 2022-07-15 13:37:05 +02:00
Laurent Destailleur
6f1d62d8a5 Fix trans 2022-07-11 17:06:03 +02:00
stickler-ci
afefc369ed Fixing style errors. 2022-07-11 10:06:31 +00:00
Yoan Mollard
39c9eb8708 Fix: fetch the right amount for membership payment
It was defaulting to 9.99
2022-07-11 12:03:24 +02:00
Yoan Mollard
2699159dea Add admin link for errormsg "click here to finish mandatory setup" 2022-07-11 12:03:24 +02:00
Laurent Destailleur
48a710dffa Update type.php 2022-07-11 11:37:58 +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
Laurent Destailleur
e29df476e6 Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
16d04e475b Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Laurent Destailleur
a871aa8f85 Merge pull request #21382 from fboitel/NEW#20650
NEW #20650 Checkbox column on left for lists
2022-07-07 21:48:51 +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
64c661b7f8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-06-29 10:10:15 +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
Faustin
1cc9eda9a6 NEW #20650 completing checkcolumn on left for propal list 2022-06-24 16:43:28 +02:00
Laurent Destailleur
0a26ac33db Fix error management 2022-06-22 16:09:32 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
NextGestion
4e939a7c5d Fix error in "Subscription" list (toselect value) 2022-05-31 15:38:23 +00:00
BENKE Charlene
c257d77dc3 php V8 warning 2022-05-28 09:47:21 +02:00
Laurent Destailleur
343056dcbd Debug v16 2022-05-25 23:43:16 +02:00
Laurent Destailleur
c79de819d3 FIX Missing import_key in member list 2022-05-25 23:27:26 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
2022-05-24 16:27:26 +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
Laurent Destailleur
3080aafa2a Merge pull request #20914 from grandoc/new_branch_20_05_2022_02
The property supplier_invoice_id does not seem to exist on Asset
2022-05-21 00:40:55 +02:00
Laurent Destailleur
168d1d4334 Merge pull request #20890 from Hystepik/develop#1
Fix : php 8.0 warnings
2022-05-20 19:41:20 +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
Marc de Lima Lucio
25196fa709 FIX: new member subscription: bank account and payment mode might be hidden 2022-05-19 10:20:31 +02:00
Laurent Destailleur
c1e864f4e2 Clean code 2022-05-18 23:15:11 +02:00