Laurent Destailleur
74de4edc42
Merge pull request #17531 from daraelmin/daraelmin-patch-1
...
Fix vulnerability - Wrong permission in adherent card
2021-05-11 19:17:33 +02:00
Laurent Destailleur
0ff473aba7
Update card.php
2021-05-11 19:15:30 +02:00
Philippe GRAND
1e844a78a6
comment translation
2021-05-09 16:46:38 +02:00
daraelmin
2c8da5703f
Fix Wrong test for permission in adherent car
2021-05-07 16:52:44 +02:00
stickler-ci
cbac815c66
Fixing style errors.
2021-05-07 11:56:20 +00:00
daraelmin
bd35b9aad2
Fix missing FORCEMORPHY in new member form setup
2021-05-07 13:54:53 +02:00
NextGestion
6f85cab6c4
Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership
2021-05-04 10:55:19 +01:00
daraelmin
6644fd3a73
Fix undefined translation key
2021-05-03 22:15:40 +02:00
Laurent Destailleur
9973085613
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/propal/card.php
htdocs/compta/bank/releve.php
htdocs/compta/paiement/rapport.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/reception/card.php
htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
cbc481dc60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/list.php
htdocs/adherents/type.php
htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:41 +02:00
Laurent Destailleur
ec544cb20e
Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype
...
NEW #17292 default subscription amount by adherent type
2021-05-03 15:32:39 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
daraelmin
1d05ce4a15
Update comment
2021-05-01 21:40:43 +02:00
daraelmin
28ba847709
camelCase format for method amountByType
2021-05-01 20:43:58 +02:00
stickler-ci
832ceb2be3
Fixing style errors.
2021-05-01 18:36:59 +00:00
daraelmin
b643af9c03
Remove unused code from reverted pr
2021-05-01 20:28:47 +02:00
daraelmin
4c3e37681c
Update adherent_type.class.php
2021-05-01 20:06:15 +02:00
daraelmin
5f23c68f85
Update type.php
2021-05-01 20:01:18 +02:00
Laurent Destailleur
223a06b77d
Clean code
2021-04-30 16:41:41 +02:00
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +02:00
Laurent Destailleur
0d4eaca3e8
Merge pull request #17426 from daraelmin/daraelmin-patch-v11
...
Fix wrong alias in natural_search v11-v14
2021-04-30 11:58:53 +02:00
Laurent Destailleur
08c85a88c8
Merge pull request #17437 from daraelmin/daraelmin-patch-v11-2
...
Fix logical test always false V11 to v14
2021-04-30 11:57:58 +02:00
daraelmin
4174ebd9c0
Fix subscription =="yes"
2021-04-29 23:11:51 +02:00
daraelmin
965eb2d639
Fix logical test always false
...
subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
2021-04-29 22:57:39 +02:00
Laurent Destailleur
de8e291c7e
Debug v14
2021-04-29 10:01:10 +02:00
daraelmin
68415322ec
Fix v11 wrong alias in natural_search
2021-04-29 10:00:54 +02:00
Laurent Destailleur
887bce8235
Avoid duplicate declaration
2021-04-28 20:59:21 +02:00
daraelmin
ea5493be87
Update adherent.class.php
2021-04-28 17:54:47 +02:00
stickler-ci
95389b4f57
Fixing style errors.
2021-04-28 15:33:37 +00:00
daraelmin
6b3024b153
statut is not status in adherent class
2021-04-28 17:29:52 +02:00
Laurent Destailleur
2532ca39de
Merge pull request #17414 from daraelmin/daraelmin-adhconststatus-card
...
Clean code use const adh statut instead of integer in adh card
2021-04-28 15:34:25 +02:00
daraelmin
bc61fdd487
Missing $
2021-04-28 14:58:13 +02:00
daraelmin
972b325a51
Clean code
2021-04-28 08:14:18 +02:00
daraelmin
65a83036ed
Clean code use const adh statut instead of integer
2021-04-28 07:45:36 +02:00
daraelmin
c1d07a457b
Mispelling
2021-04-27 22:00:21 +02:00
daraelmin
e365337440
Use status constant instead of integer
2021-04-27 21:43:13 +02:00
Laurent Destailleur
3d3e8786af
Update adherent.class.php
2021-04-27 21:24:59 +02:00
stickler-ci
d0d034672d
Fixing style errors.
2021-04-27 19:10:01 +00:00
daraelmin
082423efa0
libstatut
2021-04-27 21:09:37 +02:00
daraelmin
7f3810e703
update $field also
2021-04-27 20:53:14 +02:00
daraelmin
d3c7ab402d
Fix wrong set of constant
2021-04-27 20:45:04 +02:00
Laurent Destailleur
035828ba51
Add missing constants
2021-04-27 19:45:56 +02:00
Laurent Destailleur
f0eef3a6de
Merge pull request #17375 from indelog/fix_adhpayextid
...
Fix : missig ext_payment_id on adh public pay
2021-04-26 22:40:15 +02:00
Laurent Destailleur
42938ffe31
FIX #yogosha5879
2021-04-24 21:15:09 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Indelog
78a6284bd2
Fix : missig ext_payment_id on adh public pay
...
When pay a mebership contibution whit public link the payment add add in
database don't have a "ext_payment_id". This fix it.
2021-04-22 18:01:52 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
stickler-ci
6f32b2edda
Fixing style errors.
2021-04-19 13:23:36 +00:00
NextGestion
263e110ca3
Enhance module Member
2021-04-19 13:19:32 +01:00
NextGestion
f7b1ee9aba
Add property "website" on the member card
2021-04-17 13:15:16 +01:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions
...
Next picto mass actions
2021-04-16 20:40:19 +02:00
Laurent Destailleur
bf547cf20d
Debug v14
2021-04-15 14:33:48 +02:00
Laurent Destailleur
ce1a257522
Fix remove a setup that should not exists. Info is already into a table
2021-04-15 13:53:24 +02:00
Anthony Berton
a612831e28
next_change
2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689
Fix picto for tags
2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Laurent Destailleur
15d8a4af73
Merge pull request #17227 from dolibit-ut/patch-265
...
Update member_emails.php
2021-04-13 12:12:05 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
stickler-ci
d7665b49c1
Fixing style errors.
2021-04-12 16:44:07 +00:00
UT from dolibit
e177bb059d
Update member_emails.php
2021-04-12 18:41:44 +02:00
UT from dolibit
a917382f6c
Update member_type_extrafields.php
...
$help_url => |DE:Modul_Mitglieder';
2021-04-12 18:29:07 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2
Clean code of ol deprecated option
2021-04-12 15:37:26 +02:00
Laurent Destailleur
17b446e8f7
Update adherent.class.php
2021-04-09 12:27:10 +02:00
daraelmin
555a968f93
Fix html style error
2021-04-09 02:54:11 +02:00
daraelmin
071b50debf
Copyright
2021-04-09 02:51:05 +02:00
daraelmin
9ee80be23f
fix code style errors
2021-04-09 02:40:21 +02:00
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
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
7223512d47
Merge pull request #17030 from dolibit-ut/patch-192
...
Update type_translation.php
2021-03-30 19:23:01 +02:00
Laurent Destailleur
e763bb5483
Update type_translation.php
2021-03-30 19:22:51 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
UT from dolibit
0585712014
Update type_translation.php
...
LICENSE
https://
2021-03-30 17:18:49 +02:00
Laurent Destailleur
de5df84207
Merge pull request #16990 from daraelmin/daraelmin-adh-create-soc
...
Close #15830 Add setup option ADHERENT_DEFAULT_CREATE_THIRDPARTY
2021-03-30 00:55:17 +02:00
Laurent Destailleur
843e0a2c39
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
Laurent Destailleur
ae0468e107
FIX #yogosha5765
2021-03-29 21:04:33 +02:00
Laurent Destailleur
a23a2a0119
Merge pull request #16988 from daraelmin/daraelmin-patch-excluded
...
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
2021-03-29 17:39:58 +02:00
Laurent Destailleur
64b925a5d8
Update index.php
2021-03-29 17:39:11 +02:00
Laurent Destailleur
cdc1ae6f59
Update adherent.class.php
2021-03-29 17:38:37 +02:00
Laurent Destailleur
78d7cfffa8
FIX #yogosha5747
2021-03-29 15:25:28 +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
c700767b54
Update copyright
2021-03-29 03:28:32 +02:00
daraelmin
b6d03dcad0
Update copyright
2021-03-29 03:27:02 +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
8b1d4a6024
Copyright adherents/index.php
2021-03-28 22:40:41 +02:00
daraelmin
d9733b395e
Copyright in adherents/card.php
2021-03-28 22:30:47 +02:00
stickler-ci
b7045ef3a0
Fixing style errors.
2021-03-28 17:42:18 +00:00
daraelmin
1ae0e2a920
fix stafix style errorsle fix stale errorfix style errors
2021-03-28 19:38:20 +02:00
daraelmin
6fdff2c3ab
autoaffect individual status for thirdparty
2021-03-28 19:19:40 +02:00
daraelmin
e0551f1e32
Add ADHERENT_DEFAULT_CREATE_THIRDPARTY
2021-03-27 17:29:06 +01:00
daraelmin
bad5aa6468
fix excluded member color in graph
2021-03-27 13:39:15 +01:00
Laurent Destailleur
01c1101b29
Look and feel v14
2021-03-26 18:16:12 +01:00
Laurent Destailleur
8b4870b8b2
Fix look and feel v14
2021-03-24 23:44:50 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
86c7ab922a
Fix #yogosha5728
2021-03-24 18:57:23 +01:00
Regis Houssin
05419441aa
FIX missing return edit if update error
2021-03-23 19:58:15 +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
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
17e5605430
Merge branch 'develop' into patch-3
2021-03-21 21:02:53 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu
...
Close #16255 Add new status "excluded" in membership management module
2021-03-21 20:56:07 +01:00
Laurent Destailleur
6cdfbc2e8c
Update website.php
2021-03-21 20:50:00 +01:00
stickler-ci
e779723ae3
Fixing style errors.
2021-03-21 13:50:35 +00:00
daraelmin
054864eccc
Merge branch 'develop' into daraelmin-status-exclu
2021-03-21 14:42:01 +01:00
daraelmin
e910810037
activate exlcude button
2021-03-21 14:38:15 +01:00
daraelmin
99d4618ab5
Fix 16897 V13 Wrong picto for Expired membership
...
Force picto for Expired membership when no subscription is needed to Waiting (as other)
2021-03-21 13:49:17 +01:00
daraelmin
860a2f2ffa
Fix #16893 picto UpToDate change to Unpaid sometimes
...
#Fix #16893 picto UpToDate change to Unpaid sometimes
As $now is set on the start of the script.
But, the timestamp may change before LibStatut is called at the end.
To avoid this we add 10 second to $now before comparing to dol_now() in LibStatut
2021-03-21 11:36:23 +01:00
Frédéric FRANCE
b7a46ae838
fix php8 warnings
2021-03-20 21:50:47 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
Frédéric FRANCE
fdcd7cc316
remove old fixed boxes in member area
2021-03-20 18:49:56 +01:00
daraelmin
4d8ed4bd40
merge develop
2021-03-20 15:34:30 +01:00
Laurent Destailleur
ae2d7b5096
Merge pull request #16826 from dolibit-ut/patch-119
...
Update document.php
2021-03-20 12:50:03 +01:00
Laurent Destailleur
0e2234db8b
Merge pull request #16818 from daraelmin/daraelmin-patch-2
...
Code translation
2021-03-20 11:59:29 +01:00
Laurent Destailleur
9774d5ea4f
Merge pull request #16825 from dolibit-ut/patch-118
...
Update agenda.php
2021-03-20 11:52:51 +01:00
Laurent Destailleur
86094525b1
Merge pull request #16829 from dolibit-ut/patch-121
...
Update subscription.php
2021-03-20 11:52:42 +01:00
Laurent Destailleur
655dc68087
Merge pull request #16827 from dolibit-ut/patch-120
...
Update note.php
2021-03-20 11:52:32 +01:00
Laurent Destailleur
db71b3cbf8
Merge pull request #16830 from dolibit-ut/patch-122
...
Update type_translation.php
2021-03-20 11:51:05 +01:00
Laurent Destailleur
0e4d977549
Merge pull request #16847 from ptibogxiv/patch-419
...
FIx get optionnal in membertype with API
2021-03-20 11:38:00 +01:00
Laurent Destailleur
30d25f6a82
Merge pull request #16848 from frederic34/patch-3
...
fix php8 warning
2021-03-20 11:37:12 +01:00
Laurent Destailleur
acbce4b380
Merge pull request #16852 from frederic34/patch-7
...
fix php8 warning
2021-03-20 11:28:18 +01:00
Laurent Destailleur
f26abf73ce
Merge pull request #16853 from frederic34/patch-8
...
fix php8 warnings
2021-03-20 11:27:50 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment
...
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
53ff22d625
fix doxygen
2021-03-20 09:18:40 +01:00
Frédéric FRANCE
65e4acdb82
fix php8 warnings
2021-03-19 17:23:28 +01:00
Frédéric FRANCE
19079dcae6
fix php8 warning
2021-03-19 17:17:08 +01:00
Frédéric FRANCE
84b71dbcc8
fix php8 warning
2021-03-19 16:34:17 +01:00
Laurent Destailleur
5a4ffc18b9
FIx #yogosha5667
2021-03-19 13:02:55 +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
UT from dolibit
74de272236
Update type_translation.php
...
$help_url = '';
....
$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Mitglieder';
llxHeader('', $title, $help_url);
2021-03-19 09:19:28 +01:00
UT from dolibit
c0a420bcb7
Update subscription.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:17:24 +01:00
stickler-ci
668deefc9e
Fixing style errors.
2021-03-19 08:16:44 +00:00
UT from dolibit
b17c5b50cd
Update note.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:15:48 +01:00
stickler-ci
e5eddff0a5
Fixing style errors.
2021-03-19 08:15:14 +00:00
UT from dolibit
b0f26ca2ee
Update document.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:14:47 +01:00
UT from dolibit
d76bd583f5
Update agenda.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:13:06 +01:00
daraelmin
e290884552
update subscription and type
2021-03-18 23:23:57 +01:00
daraelmin
071b6a1bdc
Code translation
2021-03-18 23:11:19 +01:00
Laurent Destailleur
2fa1790fe9
Merge pull request #16784 from frederic34/patch-15
...
fix php8 warning
2021-03-18 23:08:31 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
ebd79afa6f
Merge pull request #16788 from frederic34/patch-17
...
fix php8 warning
2021-03-18 22:57:57 +01:00
UT from dolibit
972d162c5e
Update type.php
...
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
2021-03-18 21:16:44 +01:00
