Commit Graph

601 Commits

Author SHA1 Message Date
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
f83cf3a17b
Update copyright 2021-03-29 03:29:21 +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
daraelmin
e910810037 activate exlcude button 2021-03-21 14:38:15 +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
daraelmin
47f7ee09cf
img_picto for excluded should be status8 2021-03-13 21:10:47 +01:00
daraelmin
8f73334a79
Add excluded status in adherent class 2021-03-13 18:24:17 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Frédéric FRANCE
914d2ae7f7
Merge remote-tracking branch 'upstream/develop' into patch-13 2020-12-04 20:40:35 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Frédéric FRANCE
9a2f945807
Merge remote-tracking branch 'upstream/develop' into patch-13 2020-11-27 11:15:10 +01:00
Laurent Destailleur
7bf12c8720 Fix name into popup of member in list of subscriptions 2020-11-27 01:22:13 +01:00
Laurent Destailleur
47a5037155 Fix dolGetFirstLastname() for 4 and 5 2020-11-27 01:18:01 +01:00
Frédéric FRANCE
0735993839
set ref at create 2020-11-11 12:17:23 +01:00
Frédéric FRANCE
c7557fdb8a
specimen 2020-11-11 11:12:19 +01:00
Frédéric FRANCE
4d48eb96ed
Update adherent.class.php 2020-11-11 07:16:07 +01:00
Frédéric FRANCE
016c9915ef
Update 12.0.0-13.0.0.sql
add ref in class

add ref in getNomUrl

add ref on card
2020-11-10 23:03:03 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-04 19:00:10 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Frédéric FRANCE
0e7b1ff1c7
doxygen 2020-11-01 15:39:01 +01:00
Frédéric FRANCE
e52b79d586
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Frédéric FRANCE
26406b0f9f
Update adherent.class.php 2020-11-01 08:56:56 +01:00
Frédéric FRANCE
07432779d9
doxygen 2020-11-01 08:48:53 +01:00
Frédéric FRANCE
f721338bd8
work on members 2020-10-30 07:57:53 +01:00
Frédéric FRANCE
79941a8dde
Update adherent.class.php 2020-10-28 19:10:54 +01:00
Frédéric FRANCE
b9f593b73a
Update adherent.class.php 2020-10-27 20:46:32 +01:00
Frédéric FRANCE
6d6b143011
Update adherent.class.php 2020-10-27 20:11:18 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Bernard Saulme
d947ade7db
Update adherent.class.php
NEW Add _TYPE__ substitution key
2020-08-19 21:19:56 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Florian Mortgat
d491f2cf54 [pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory 2020-05-27 18:27:10 +02:00
Frédéric FRANCE
ccc859ec80
add new rule 2020-05-21 09:12:18 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule 2020-05-21 00:47:16 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Josep Lluís
d2e35fc1f7 NEW: add addlinktonotes in members list 2020-04-02 17:49:01 +02:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
a6d340a22c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Laurent Destailleur
deda6252f2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/class/expensereport.class.php
2020-03-04 19:22:30 +01:00
ptibogxiv
060df57cb1
FIX: fk_type subscription list via api REST
v10 to dev
2020-03-03 11:58:15 +01:00
Laurent Destailleur
7431bf0592 Try formating profile 2020-02-24 22:53:14 +01:00
Laurent Destailleur
b52f458517 Clean code 2020-02-24 22:20:15 +01:00
Laurent Destailleur
c3beb854a2 Definition of $fields for member and subscriptions 2020-02-08 13:44:31 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-02 18:34:09 +00:00
Laurent Destailleur
55388d053f Var not defined 2020-01-30 13:01:42 +01:00
Laurent Destailleur
a88e1ac605 Better translation 2020-01-28 21:35:03 +01:00
stickler-ci
1c26139789 Fixing style errors. 2020-01-28 20:29:17 +00:00
ptibogxiv
ae1dbdd34f
Update adherent.class.php 2020-01-28 21:27:11 +01:00
Laurent Destailleur
471e1d71a0 Fix send remind by email 2020-01-28 11:38:27 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Frédéric FRANCE
833e761633
Update adherent.class.php 2019-10-24 16:35:48 +02:00
Laurent Destailleur
7297514afb NEW Use the gender of member for picto in member lists. 2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07 Theme v11 2019-10-23 20:12:29 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
3acf7211c3
Merge pull request #11847 from ptibogxiv/patch-257
NEW: Option to allow to create members from third-party
2019-10-08 15:08:34 +02:00
Laurent Destailleur
da5890e584
Update adherent.class.php 2019-10-07 20:32:51 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Sebastien Baguet
5dbf34a864 Small fix on a query 2019-10-03 13:34:47 +02:00
Sebastien Baguet
9daffcbe07 Fix for no subscription members 2019-10-03 00:29:41 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6
work on migration script 2019-10-01 20:14:06 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Frédéric FRANCE
e4a0de245a
work on user 2019-09-12 18:41:26 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Frédéric FRANCE
dc2ea3cef9
add socialnetworks dictionary 2019-09-11 23:00:14 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00