Regis Houssin
05419441aa
FIX missing return edit if update error
2021-03-23 19:58:15 +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
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
17e5605430
Merge branch 'develop' into patch-3
2021-03-21 21:02:53 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu
...
Close #16255 Add new status "excluded" in membership management module
2021-03-21 20:56:07 +01:00
Laurent Destailleur
6cdfbc2e8c
Update website.php
2021-03-21 20:50:00 +01:00
stickler-ci
e779723ae3
Fixing style errors.
2021-03-21 13:50:35 +00:00
daraelmin
054864eccc
Merge branch 'develop' into daraelmin-status-exclu
2021-03-21 14:42:01 +01:00
daraelmin
e910810037
activate exlcude button
2021-03-21 14:38:15 +01:00
daraelmin
99d4618ab5
Fix 16897 V13 Wrong picto for Expired membership
...
Force picto for Expired membership when no subscription is needed to Waiting (as other)
2021-03-21 13:49:17 +01:00
daraelmin
860a2f2ffa
Fix #16893 picto UpToDate change to Unpaid sometimes
...
#Fix #16893 picto UpToDate change to Unpaid sometimes
As $now is set on the start of the script.
But, the timestamp may change before LibStatut is called at the end.
To avoid this we add 10 second to $now before comparing to dol_now() in LibStatut
2021-03-21 11:36:23 +01:00
Frédéric FRANCE
b7a46ae838
fix php8 warnings
2021-03-20 21:50:47 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
Frédéric FRANCE
fdcd7cc316
remove old fixed boxes in member area
2021-03-20 18:49:56 +01:00
daraelmin
4d8ed4bd40
merge develop
2021-03-20 15:34:30 +01:00
Laurent Destailleur
ae2d7b5096
Merge pull request #16826 from dolibit-ut/patch-119
...
Update document.php
2021-03-20 12:50:03 +01:00
Laurent Destailleur
0e2234db8b
Merge pull request #16818 from daraelmin/daraelmin-patch-2
...
Code translation
2021-03-20 11:59:29 +01:00
Laurent Destailleur
9774d5ea4f
Merge pull request #16825 from dolibit-ut/patch-118
...
Update agenda.php
2021-03-20 11:52:51 +01:00
Laurent Destailleur
86094525b1
Merge pull request #16829 from dolibit-ut/patch-121
...
Update subscription.php
2021-03-20 11:52:42 +01:00
Laurent Destailleur
655dc68087
Merge pull request #16827 from dolibit-ut/patch-120
...
Update note.php
2021-03-20 11:52:32 +01:00
Laurent Destailleur
db71b3cbf8
Merge pull request #16830 from dolibit-ut/patch-122
...
Update type_translation.php
2021-03-20 11:51:05 +01:00
Laurent Destailleur
0e4d977549
Merge pull request #16847 from ptibogxiv/patch-419
...
FIx get optionnal in membertype with API
2021-03-20 11:38:00 +01:00
Laurent Destailleur
30d25f6a82
Merge pull request #16848 from frederic34/patch-3
...
fix php8 warning
2021-03-20 11:37:12 +01:00
Laurent Destailleur
acbce4b380
Merge pull request #16852 from frederic34/patch-7
...
fix php8 warning
2021-03-20 11:28:18 +01:00
Laurent Destailleur
f26abf73ce
Merge pull request #16853 from frederic34/patch-8
...
fix php8 warnings
2021-03-20 11:27:50 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment
...
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
53ff22d625
fix doxygen
2021-03-20 09:18:40 +01:00
Frédéric FRANCE
65e4acdb82
fix php8 warnings
2021-03-19 17:23:28 +01:00
Frédéric FRANCE
19079dcae6
fix php8 warning
2021-03-19 17:17:08 +01:00
Frédéric FRANCE
84b71dbcc8
fix php8 warning
2021-03-19 16:34:17 +01:00
Laurent Destailleur
5a4ffc18b9
FIx #yogosha5667
2021-03-19 13:02:55 +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
UT from dolibit
74de272236
Update type_translation.php
...
$help_url = '';
....
$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Mitglieder';
llxHeader('', $title, $help_url);
2021-03-19 09:19:28 +01:00
UT from dolibit
c0a420bcb7
Update subscription.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:17:24 +01:00
stickler-ci
668deefc9e
Fixing style errors.
2021-03-19 08:16:44 +00:00
UT from dolibit
b17c5b50cd
Update note.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:15:48 +01:00
stickler-ci
e5eddff0a5
Fixing style errors.
2021-03-19 08:15:14 +00:00
UT from dolibit
b0f26ca2ee
Update document.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:14:47 +01:00
UT from dolibit
d76bd583f5
Update agenda.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:13:06 +01:00
daraelmin
e290884552
update subscription and type
2021-03-18 23:23:57 +01:00
daraelmin
071b6a1bdc
Code translation
2021-03-18 23:11:19 +01:00
Laurent Destailleur
2fa1790fe9
Merge pull request #16784 from frederic34/patch-15
...
fix php8 warning
2021-03-18 23:08:31 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
ebd79afa6f
Merge pull request #16788 from frederic34/patch-17
...
fix php8 warning
2021-03-18 22:57:57 +01:00
UT from dolibit
972d162c5e
Update type.php
...
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
2021-03-18 21:16:44 +01:00
Frédéric FRANCE
39acef8df7
Update card.php
2021-03-18 08:26:47 +01:00
