2
0
forked from Wavyzz/dolibarr
Commit Graph

767 Commits

Author SHA1 Message Date
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
216b3c885d Fix escaping 2020-09-20 01:30:36 +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
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
701b83db38 FIX Bad number of subscription (forgotten when member was resiliated) 2020-09-14 02:38:12 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
ptibogxiv
a64223f73d Update api_members.class.php 2020-08-29 12:44:17 +02:00
stickler-ci
96b3474185 Fixing style errors. 2020-08-29 10:40:30 +00:00
ptibogxiv
7fe83b24ba NEW api get member by thirdparty 2020-08-29 12:38:22 +02:00
Laurent Destailleur
9c74211873 Merge pull request #14508 from b92/develop
NEW Add __TYPE__ substitution key
2020-08-23 18:09:49 +02:00
Bernard Saulme
d947ade7db Update adherent.class.php
NEW Add _TYPE__ substitution key
2020-08-19 21:19:56 +02:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
ptibogxiv
37007d6d1a Update subscription.class.php 2020-06-07 16:12:28 +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
ba8cf2b398 add new rule 2020-05-21 09:21:30 +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
b426bbe758 Fix bad code 2020-04-25 17:47:41 +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
stickler-ci
2849d00b4d Fixing style errors. 2020-04-15 16:39:15 +00:00
ptibogxiv
f6174ddf4a NEW API filter members by category 2020-04-15 18:37:20 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00: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
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Laurent Destailleur
d2aa4ba54e Update adherent_type.class.php 2019-11-16 00:41:55 +01:00
ptibogxiv
332c91aa11 Update adherent_type.class.php 2019-11-14 20:10:14 +01:00
ptibogxiv
fc2e0d4f95 Update adherent_type.class.php 2019-11-14 20:09:36 +01:00
stickler-ci
f369fa06a6 Fixing style errors. 2019-11-14 19:04:18 +00:00
ptibogxiv
892b61f1c2 Update adherent_type.class.php 2019-11-14 20:02:44 +01:00