stickler-ci
|
dce5c6be8f
|
Fixing style errors.
|
2021-04-09 00:28:07 +00:00 |
|
daraelmin
|
f2a49ef72f
|
New option amount by member type
|
2021-04-09 02:23:22 +02:00 |
|
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
|
ae94ce594e
|
Update copyright
|
2021-03-29 03:30:44 +02:00 |
|
daraelmin
|
f83cf3a17b
|
Update copyright
|
2021-03-29 03:29:21 +02:00 |
|
daraelmin
|
28ff0f2bc3
|
Copyright adherent_type.class.php
|
2021-03-28 22:50:27 +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 |
|
Laurent Destailleur
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +01:00 |
|
daraelmin
|
e910810037
|
activate exlcude button
|
2021-03-21 14:38:15 +01:00 |
|
daraelmin
|
4d8ed4bd40
|
merge develop
|
2021-03-20 15:34:30 +01:00 |
|
stickler-ci
|
ba29f327a9
|
Fixing style errors.
|
2021-03-19 11:41:27 +00:00 |
|
ptibogxiv
|
a9398e5630
|
FIx get optionnal in membertype with API
|
2021-03-19 12:39:38 +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
|
d979440ca6
|
Call exclude() when updating status to -2
|
2021-03-13 19:21:44 +01:00 |
|
daraelmin
|
39fba3c4a9
|
Update comment to mention exclude() fonction
|
2021-03-13 19:17:28 +01:00 |
|
daraelmin
|
5f0249894d
|
Add property mail_exclusion
Unused for the moment
|
2021-03-13 19:11:21 +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 |
|
Laurent Destailleur
|
32370bf63d
|
Look and feel v14
|
2021-02-15 20:13:38 +01:00 |
|
Frédéric FRANCE
|
f394e55ade
|
deprecate non camelCaps functions
|
2021-02-09 10:26:17 +01:00 |
|
Laurent Destailleur
|
b88ee6eff4
|
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
|
2021-01-01 21:36:15 +01:00 |
|
Frédéric FRANCE
|
94e859bf6a
|
doxygen
|
2020-12-30 21:41:44 +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 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01: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 |
|
Laurent Destailleur
|
2f6f242d99
|
CSS
|
2020-11-23 12:29:38 +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
|
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 |
|
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 |
|