2
0
forked from Wavyzz/dolibarr
Commit Graph

767 Commits

Author SHA1 Message Date
Laurent Destailleur
19a203bd40 Fix amount of memberships 2021-05-12 22:09:06 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
ec544cb20e Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype
NEW #17292 default subscription amount by adherent type
2021-05-03 15:32:39 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
daraelmin
1d05ce4a15 Update comment 2021-05-01 21:40:43 +02:00
daraelmin
28ba847709 camelCase format for method amountByType 2021-05-01 20:43:58 +02:00
stickler-ci
832ceb2be3 Fixing style errors. 2021-05-01 18:36:59 +00:00
daraelmin
4c3e37681c Update adherent_type.class.php 2021-05-01 20:06:15 +02:00
Laurent Destailleur
887bce8235 Avoid duplicate declaration 2021-04-28 20:59:21 +02:00
daraelmin
ea5493be87 Update adherent.class.php 2021-04-28 17:54:47 +02:00
stickler-ci
95389b4f57 Fixing style errors. 2021-04-28 15:33:37 +00:00
daraelmin
6b3024b153 statut is not status in adherent class 2021-04-28 17:29:52 +02:00
daraelmin
c1d07a457b Mispelling 2021-04-27 22:00:21 +02:00
daraelmin
e365337440 Use status constant instead of integer 2021-04-27 21:43:13 +02:00
Laurent Destailleur
3d3e8786af Update adherent.class.php 2021-04-27 21:24:59 +02:00
stickler-ci
d0d034672d Fixing style errors. 2021-04-27 19:10:01 +00:00
daraelmin
082423efa0 libstatut 2021-04-27 21:09:37 +02:00
daraelmin
7f3810e703 update $field also 2021-04-27 20:53:14 +02:00
daraelmin
d3c7ab402d Fix wrong set of constant 2021-04-27 20:45:04 +02:00
Laurent Destailleur
035828ba51 Add missing constants 2021-04-27 19:45:56 +02:00
Laurent Destailleur
f0eef3a6de Merge pull request #17375 from indelog/fix_adhpayextid
Fix : missig ext_payment_id on adh public pay
2021-04-26 22:40:15 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Indelog
78a6284bd2 Fix : missig ext_payment_id on adh public pay
When pay a mebership contibution whit public link the payment add add in
database don't have a "ext_payment_id". This fix it.
2021-04-22 18:01:52 +02:00
NextGestion
f7b1ee9aba Add property "website" on the member card 2021-04-17 13:15:16 +01:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
17b446e8f7 Update adherent.class.php 2021-04-09 12:27:10 +02:00
daraelmin
071b50debf Copyright 2021-04-09 02:51:05 +02:00
daraelmin
9ee80be23f fix code style errors 2021-04-09 02:40:21 +02:00
stickler-ci
dce5c6be8f Fixing style errors. 2021-04-09 00:28:07 +00:00
daraelmin
f2a49ef72f New option amount by member type 2021-04-09 02:23:22 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
cdc1ae6f59 Update adherent.class.php 2021-03-29 17:38:37 +02:00
daraelmin
ae94ce594e Update copyright 2021-03-29 03:30:44 +02:00
daraelmin
f83cf3a17b Update copyright 2021-03-29 03:29:21 +02:00
daraelmin
28ff0f2bc3 Copyright adherent_type.class.php 2021-03-28 22:50:27 +02:00
daraelmin
39933f97be Copyright adherent.class.php 2021-03-28 22:46:19 +02:00
daraelmin
bad5aa6468 fix excluded member color in graph 2021-03-27 13:39:15 +01:00
Laurent Destailleur
86c7ab922a Fix #yogosha5728 2021-03-24 18:57:23 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
daraelmin
e910810037 activate exlcude button 2021-03-21 14:38:15 +01:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
stickler-ci
ba29f327a9 Fixing style errors. 2021-03-19 11:41:27 +00:00
ptibogxiv
a9398e5630 FIx get optionnal in membertype with API 2021-03-19 12:39:38 +01:00
daraelmin
82509e2102 merged conflict with develop 2021-03-15 13:12:13 +01:00
daraelmin
639e234d4b Use dol_now instead of time() 2021-03-14 16:44:34 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
daraelmin
ed3b0032bb Syntax error 2021-03-13 22:46:51 +01:00