Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,434 Commits 36 Branches 189 Tags
e0da8a2109d6b10366ccb4610394d2bc61e4213f
Commit Graph

3158 Commits

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