Commit Graph

1143 Commits

Author SHA1 Message Date
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
2f7b445c9e doxygen 2020-11-10 21:57:49 +01:00
Laurent Destailleur
26b8e8d2bf More logs 2020-11-08 18:52:26 +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
42a3a20dfc Fix phpcs 2020-11-02 16:37:50 +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
Laurent Destailleur
47a4d2c9f6 Merge pull request #15244 from frederic34/patch-8
doxygen
2020-11-01 13:52:15 +01:00
Frédéric FRANCE
26406b0f9f Update adherent.class.php 2020-11-01 08:56:56 +01:00
Frédéric FRANCE
c2781d5551 doxygen 2020-11-01 08:54:12 +01:00
Frédéric FRANCE
07432779d9 doxygen 2020-11-01 08:48:53 +01:00
Frédéric FRANCE
49390a596c Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Frédéric FRANCE
be4a4cb54b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
f485ebc2cf Removed dead code 2020-10-31 12:56:30 +01:00
Frédéric FRANCE
2cbbf86a5b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 17:48:00 +01:00
Frédéric FRANCE
b431d99996 Update api_memberstypes.class.php 2020-10-30 16:10:23 +01:00
Frédéric FRANCE
38c2fea849 Update api_members.class.php 2020-10-30 15:21:28 +01:00
Frédéric FRANCE
6fe4f85eec work on members 2020-10-30 08:15:37 +01:00
Frédéric FRANCE
1c9cd484ad work on members 2020-10-30 08:10:28 +01:00
Frédéric FRANCE
ec6568ffbe work on members 2020-10-30 08:01:58 +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
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