Commit Graph

534 Commits

Author SHA1 Message Date
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