UT from dolibit
c0e7800251
Create index.html
2021-03-21 21:10:13 +01:00
UT from dolibit
ae91f3be63
Create index.html
2021-03-21 21:07:25 +01:00
Laurent Destailleur
3d6be68ff8
Merge pull request #16888 from frederic34/patch-3
...
remove old fixed boxes in member area
2021-03-21 21:03:00 +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
153ca5a572
Merge pull request #16896 from dolibit-ut/patch-133
...
Update llx_20_c_departements.sql
2021-03-21 20:50:31 +01:00
Laurent Destailleur
d282b0fd71
Merge pull request #16890 from frederic34/patch-4
...
fix php8 warnings
2021-03-21 20:50:20 +01:00
Laurent Destailleur
6cdfbc2e8c
Update website.php
2021-03-21 20:50:00 +01:00
Laurent Destailleur
f3f773733d
Move doc to wiki
2021-03-21 18:28:15 +01:00
Laurent Destailleur
800eeef868
Clean code
2021-03-21 18:20:37 +01:00
Laurent Destailleur
3c8bf2167b
Debug permissions
2021-03-21 18:01:43 +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
Laurent Destailleur
e688987d63
css
2021-03-21 13:46:32 +01:00
Laurent Destailleur
af199189b3
NEW Add color and picto for direction of movement
2021-03-21 13:46:01 +01:00
UT from dolibit
065561b2be
Update llx_20_c_departements.sql
...
Australia
2021-03-21 12:46:53 +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
eeb1c5d884
Replace deprecated code
2021-03-20 21:46:10 +01:00
Laurent Destailleur
fc2308d810
Fix trans
2021-03-20 21:38:01 +01:00
Laurent Destailleur
0008e916ac
Fix sql error
2021-03-20 21:36:42 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Laurent Destailleur
70be2dbcf0
Fix regression in tests
2021-03-20 20:51:19 +01:00
Laurent Destailleur
9900429fd0
Merge pull request #16889 from frederic34/adherent_to_member
...
rename files from adherent to member
2021-03-20 20:37:44 +01:00
Laurent Destailleur
f206fd67f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 20:35:58 +01:00
Laurent Destailleur
ca74fa7372
Look and feel v14
2021-03-20 20:02:58 +01:00
Laurent Destailleur
f95aa9c6e1
Merge pull request #16612 from atm-adrien/FIX/develop_update_pencil
...
FIX : Update pencil
2021-03-20 19:54:47 +01:00
Laurent Destailleur
8f6f8248a3
Merge pull request #16885 from daraelmin/daraelmin-patch-4
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 19:51:26 +01:00
Laurent Destailleur
861a5becf1
Merge pull request #16884 from daraelmin/daraelmin-patch-3
...
#Fix #16767 v13 unremovable attached file in mailmodel
2021-03-20 19:51:07 +01:00
Laurent Destailleur
e330c0f91a
Merge pull request #16883 from aspangaro/14a28
...
Uniformize information on modules
2021-03-20 19:49:33 +01:00
Laurent Destailleur
6a8f4ac892
NEW Add permission "export website"
2021-03-20 19:30:08 +01:00
Laurent Destailleur
e5a94d9257
Fix export
2021-03-20 19:16:44 +01:00
Laurent Destailleur
46aa01aea0
Fix permission on export of BOM and website
2021-03-20 19:15:15 +01:00
Frédéric FRANCE
d2f7d3064d
can use $conf->member
2021-03-20 19:09:49 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
Laurent Destailleur
f6145a119f
Fix #yogosha5679
2021-03-20 18:58:34 +01:00
Frédéric FRANCE
fdcd7cc316
remove old fixed boxes in member area
2021-03-20 18:49:56 +01:00
Laurent Destailleur
6e8a4bbc48
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 18:44:17 +01:00
Laurent Destailleur
8df083c955
Look and feel v14
2021-03-20 18:43:44 +01:00
daraelmin
4d8ed4bd40
merge develop
2021-03-20 15:34:30 +01:00
daraelmin
cb71936ccd
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 make default attached file of a mail model selected removable
2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 14:04:20 +01:00
Alexandre SPANGARO
3669c374c2
Uniformize information on modules
2021-03-20 13:55:43 +01:00
Laurent Destailleur
d0f647301b
Merge pull request #16882 from frederic34/patch-4
...
fix php8 warning
2021-03-20 13:41:32 +01:00
Laurent Destailleur
51a10ac7c6
Merge pull request #16881 from frederic34/patch-3
...
fix php8 warnings
2021-03-20 13:41:05 +01:00
Frédéric FRANCE
c1cab76722
fix php8 warning
2021-03-20 13:15:54 +01:00
Frédéric FRANCE
7df344191f
fix php8 warnings
2021-03-20 13:07:46 +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