lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

2967 Commits

Author SHA1 Message Date
Frédéric FRANCE
8221011d7d
Update list.php 2021-05-25 23:22:43 +02:00
Frédéric FRANCE
e316437a0e
fix warning 2021-05-25 23:20:55 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Laurent Destailleur
19a203bd40 Fix amount of memberships 2021-05-12 22:09:06 +02:00
Laurent Destailleur
63db00486d Fix setup 2021-05-11 19:57:20 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy 
Fix missing FORCEMORPHY in new member form setup
 2021-05-11 19:52:35 +02:00
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
Frédéric FRANCE
39acef8df7
Update card.php 2021-03-18 08:26:47 +01:00
Frédéric FRANCE
c147d47ad9
fix php8 warning 2021-03-18 08:23:06 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning 2021-03-17 23:55:46 +01:00
Frédéric FRANCE
efe75b5d0d
fix php8 warning 2021-03-17 23:45:48 +01:00
Frédéric FRANCE
bdae679463
fix php8 warnings 2021-03-16 18:42:35 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Laurent Destailleur
f0d3c19d51
Merge pull request #16690 from dolibit-ut/patch-75 
Update card.php
 2021-03-15 17:17:35 +01:00
UT from dolibit
2040596b8c
Update adherent.php 
-> $help_url   add   'DE:Modul_Mitglieder'
 2021-03-15 15:46:43 +01:00
UT from dolibit
d7e930fe63
Update card.php 
-> $help_url   add   'DE:Modul_Mitglieder'
 2021-03-15 15:44:29 +01:00
daraelmin
82509e2102 merged conflict with develop 2021-03-15 13:12:13 +01:00
Laurent Destailleur
0dd33fed4f
Merge pull request #16654 from daraelmin/daraelmin-patch-1 
Standardize var $AdherentsXXX in $MembersXXX
 2021-03-15 11:10:52 +01:00
daraelmin
0127a3bedb
Update index.php 2021-03-14 17:34:38 +01:00
daraelmin
639e234d4b
Use dol_now instead of time() 2021-03-14 16:44:34 +01:00
daraelmin
32a79cfd8d
Standardize var $AdherentsXXX in $MembersXXX 2021-03-14 15:51:00 +01:00
daraelmin
30dc375ecc
Graphcolor 2021-03-14 14:42:55 +01:00
daraelmin
749e33d518
Add SommeE 2021-03-14 14:37:20 +01:00
daraelmin
ed7dc56c82
Update index.php 2021-03-14 14:31:27 +01:00
daraelmin
193082b195
Update index.php 2021-03-14 13:59:50 +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
e2ba3b599d
Update index.php 2021-03-13 22:42:49 +01:00
daraelmin
47f7ee09cf
img_picto for excluded should be status8 2021-03-13 21:10:47 +01:00
daraelmin
64c347edfa
Add exclusion email template global variable 2021-03-13 20:25:29 +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
daraelmin
6f7f5a57e1
Search on excluded member 2021-03-13 16:11:48 +01:00
daraelmin
e038408195
Update comment on subscription creation 
subscription is not allowed if the membre status is "excluded"
 2021-03-13 15:34:29 +01:00
daraelmin
fa25ba797f
Add excluded status in adherent type stats 2021-03-13 15:28:31 +01:00
daraelmin
d138430684
Adding Excluded status in adherent as -2 2021-03-13 15:18:44 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev 
Replace gender and civility by a picto
 2021-03-11 21:36:16 +01:00
lmarcouiller
1b242a8a19 Fix #16615 : Adherent statistics color 2021-03-11 09:43:56 +01:00
Laurent Destailleur
82d5c7289d Add property widgettype 2021-03-10 17:02:39 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop 
Update fork
 2021-03-10 16:53:35 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
stickler-ci
d5e6f54b5c Fixing style errors. 2021-03-10 15:33:53 +00:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +01:00
Laurent Destailleur
a3896bd237 Restore default tabs 2021-03-08 16:47:49 +01:00
Frédéric FRANCE
b0f735350f
new box replace 2021-03-02 22:31:55 +01:00
Frédéric FRANCE
da038cf590
new box replace 2021-03-02 22:29:02 +01:00
Frédéric FRANCE
22bc3b879b
new box replace 2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace 2021-03-02 22:00:09 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
Laurent Destailleur
a161edefb1 Look and feel v14 2021-03-02 12:33:55 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 00:09:44 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
 2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Laurent Destailleur
5406de13ee css 2021-02-28 21:33:13 +01:00
Laurent Destailleur
3a0b762a6e Var not defined 2021-02-24 12:01:58 +01:00
Frédéric FRANCE
a0031901e4
complete doaction hook 2021-02-22 11:36:03 +01:00
Laurent Destailleur
b4e301893c
Update subscription.php 2021-02-22 11:22:48 +01:00
abb
765893f9e6 new:hook doActions for subscriptions with possibility to modify values of variables $datefrom,$dateto,$paymentdate inside hook 2021-02-21 19:44:27 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Laurent Destailleur
3e41f69d3d Fix bad permission check 2021-02-14 21:56:15 +01:00
Laurent Destailleur
4a35600e62
Merge pull request #16278 from bafbes/abb120357 
new : hook context subscriptioncard and restrictedArea block for subscriptions
 2021-02-14 21:53:25 +01:00
abb
d92e17aabd new : hook context subscriptioncard and restrictedArea block for subscriptions 2021-02-12 19:21:31 +01:00
abb
b8fde12def Fix : To use restrictedArea Hook, we need to call initHooks before restrictedArea 2021-02-12 17:19:45 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Frédéric FRANCE
ceff964ad5
member has ref now 2021-01-13 21:56:51 +01:00
Frédéric FRANCE
7291bf34f0
boxes 2021-01-02 22:29:23 +01:00
Frédéric FRANCE
bd762bc58f
boxes 2021-01-02 21:50:58 +01:00
Frédéric FRANCE
bd874a136e
can add box on member index page 2021-01-02 20:10:29 +01:00
Frédéric FRANCE
6fad38db57
can add box on member index page 2021-01-02 20:04:40 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +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
Alexandre SPANGARO
46160614b8 Typo 2020-12-31 03:30:18 +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
Laurent Destailleur
f8b179a1be
Merge pull request #15351 from frederic34/patch-13 
separate ref and rowid in members
 2020-12-27 15:18:55 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Florian HENRY
5ae5f3e7ac let societe project acctioncomme website accounr 2020-12-24 00:32:54 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
Corentin Giroud-Argoud
4df0efa43d [New] Add sendMail hook in subscription 
Added sendMail hook in subscription, before a mail is sent to confirm a
subscription. It makes it more flexible for modules to interact with it.
 2020-12-16 13:00:34 +01:00
Laurent Destailleur
cfa194436f Debug v13 2020-12-11 00:55:21 +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
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
e7775d2f79 Fix scrutinizer errors 2020-11-30 12:54:47 +01:00
Laurent Destailleur
fcf59180eb
Merge pull request #15541 from b92/patch-2 
Use email model option to joint file for subscription
 2020-11-28 02:27:07 +01:00
Laurent Destailleur
aa21af27db
Update subscription.php 2020-11-28 02:24:25 +01: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
Bernard Saulme
be7714be1c
Use email model option to joint file for subscription 
Allow the adherent subscription to use the email model option to join or no joint file.
 2020-11-25 18:11:36 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
780b8a6fb2 Fix navigation between members 2020-11-18 12:40:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers 2020-11-14 00:56:21 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members 2020-11-14 00:48:13 +01:00
Frédéric FRANCE
dd2ab6f360
Update card.php 2020-11-13 21:56:17 +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
d4f633ee74
check in card pdf 2020-11-10 23:41:15 +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
5d90611795
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-05 14:42:37 +01:00
Frédéric FRANCE
2dfdd98b5a
Update vcard.php 2020-11-04 20:42:16 +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
7294a47ef5 Fix generation of user from member, contact, applications for job 2020-11-04 13:33:52 +01:00
Laurent Destailleur
f5bdc1db6d
Update card.php 2020-11-02 20:15:03 +01:00
Frédéric FRANCE
3afb577888
Update card.php 2020-11-02 18:35:39 +01:00
Laurent Destailleur
ed6925d87d Fix label 2020-11-02 16:46:28 +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
4f09b87ec5
Merge pull request #15245 from frederic34/patch-10 
fix vcard birthday of member
 2020-11-01 13:53:14 +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
7b8c05250f
fix vcard birthday of member 2020-11-01 09:13:02 +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