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 |
|
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 |
|
stickler-ci
|
280c0a56b6
|
Fixing style errors.
|
2019-11-14 15:37:54 +00:00 |
|
ptibogxiv
|
ae2ddb1f1e
|
Fix adherent type v11
|
2019-11-14 16:36:07 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
stickler-ci
|
8007b22030
|
Fixing style errors.
|
2019-11-03 11:37:44 +00:00 |
|
ptibogxiv
|
871b6d9dd6
|
NEW change duration membertype
|
2019-11-03 12:35:05 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +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
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +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 |
|
Laurent Destailleur
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +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 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +02:00 |
|
stickler-ci
|
8d8ded324d
|
Fixing style errors.
|
2019-09-17 11:56:16 +00:00 |
|
ptibogxiv
|
a295d57e0c
|
Update adherent_type.class.php
|
2019-09-17 13:54:17 +02:00 |
|
ptibogxiv
|
c01ab4ab53
|
Update adherent_type.class.php
|
2019-09-17 13:53:34 +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
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
1d74387125
|
Removed deprecated property ->numero (We must use ->num_payment)
|
2019-09-09 08:47:23 +02:00 |
|
ptibogxiv
|
2d3b0a7d43
|
Update adherent.class.php
|
2019-09-08 20:05:13 +02:00 |
|
Alexandre SPANGARO
|
3a8d8ee902
|
FIX #11401 Adherent unknown language key
|
2019-09-08 03:56:01 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Laurent Destailleur
|
733c90956f
|
Fix phpunit
|
2019-09-02 03:40:09 +02:00 |
|
Laurent Destailleur
|
97a1a47266
|
Change deprecated properties with new name
|
2019-09-01 22:21:48 +02:00 |
|
Laurent Destailleur
|
f6c2fb77ae
|
Fix scrutinizer
|
2019-09-01 22:02:48 +02:00 |
|
Laurent Destailleur
|
2f49fc6a7b
|
Fix scrutinizer
|
2019-08-31 02:49:54 +02:00 |
|
Laurent Destailleur
|
48db5c2a44
|
Replace deprecated actioncomm->note into actioncomm->note_private
|
2019-08-31 02:46:39 +02:00 |
|
Laurent Destailleur
|
d5328d1cec
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-27 15:43:19 +02:00 |
|
Laurent Destailleur
|
478b1fea25
|
FIX #11711
|
2019-08-27 15:06:50 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
Laurent Destailleur
|
0bc90d81c8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-02 12:05:12 +02:00 |
|
Laurent Destailleur
|
c01ac05aec
|
FIX Content of email for subscription
|
2019-08-02 12:04:06 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Regis Houssin
|
4dab57b494
|
FIX phpcs
|
2019-07-13 11:24:25 +02:00 |
|
Regis Houssin
|
b7df4a2cd0
|
FIX this function can not be private
|
2019-07-13 11:21:07 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
7de0f5c0be
|
NEW Avoid wrap between picto and text on getNomUrl
|
2019-06-25 10:22:39 +02:00 |
|
Laurent Destailleur
|
efa09301b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 20:19:14 +02:00 |
|
Laurent Destailleur
|
71b266b5a8
|
Code comment
|
2019-06-22 19:20:01 +02:00 |
|
Laurent Destailleur
|
4308f48cad
|
Merge branch 'develop' into MissingHook
|
2019-06-20 03:04:32 +02:00 |
|
Laurent Destailleur
|
bf71731fc9
|
Fix phpcs
|
2019-06-19 22:28:33 +02:00 |
|
Nicolas ZABOURI
|
b6bd4119d9
|
FIX travis Public underscore in load_ldap_info
|
2019-06-19 09:12:01 +02:00 |
|
Laurent Destailleur
|
525598f6aa
|
Fix scrutinizer warnings
|
2019-06-18 20:01:28 +02:00 |
|
Laurent Destailleur
|
e8ba312d2a
|
Fix phpcs
|
2019-05-23 14:25:16 +02:00 |
|
Frédéric FRANCE
|
a368a6a43e
|
Update adherent_type.class.php
|
2019-05-19 11:52:34 +02:00 |
|
Frédéric FRANCE
|
a09584ae4b
|
The method _load_ldap_dn() cannot be called...
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
|
2019-05-19 09:46:47 +02:00 |
|
Laurent Destailleur
|
d789004782
|
Update adherent.class.php
|
2019-05-09 15:35:55 +02:00 |
|
ptibogxiv
|
3ddd5110ef
|
Update adherent.class.php
|
2019-05-09 13:42:32 +02:00 |
|