Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,561 Commits 36 Branches 190 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

582 Commits

Author SHA1 Message Date
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
f3d54aada5 Clean code 2021-06-09 23:48:28 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
facf594b2d FIX Date of invoice generated from membership must be current date 2021-06-08 16:01:26 +02:00
Laurent Destailleur
4f6a5cf5f7 Debug v14 2021-06-07 10:08:31 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
ptibogxiv
36accba5c9 Fix date_start of last subscription 2021-06-05 14:43:40 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01: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
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
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
f7b1ee9aba Add property "website" on the member card 2021-04-17 13:15:16 +01:00
Laurent Destailleur
17b446e8f7 Update adherent.class.php 2021-04-09 12:27:10 +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
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
f83cf3a17b Update copyright 2021-03-29 03:29:21 +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
daraelmin
e910810037 activate exlcude button 2021-03-21 14:38:15 +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
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
Frédéric FRANCE
f394e55ade deprecate non camelCaps functions 2021-02-09 10:26:17 +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