Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 00:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

3348 Commits

Author SHA1 Message Date
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