Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 05:51:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,088 Commits 36 Branches 190 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

601 Commits

Author SHA1 Message Date
Laurent Destailleur
bedb08df50 Clean and debug online payment code 2022-04-08 15:15:55 +02:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Frédéric FRANCE
dad73b755e fix merge 2022-02-15 18:46:41 +01:00
Frédéric FRANCE
0ba912b1e5 add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
85d158d302 Update adherent.class.php 2022-02-15 11:09:07 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
6e27abaed9 FIX redirect to payment page when membership payment mode forced 2021-11-27 17:19:16 +01:00
Philippe GRAND
1c41735b11 fix bad path 2021-11-17 10:07:05 +01:00
Regis Houssin
7324375caa FIX missing rename function 2021-11-12 13:15:40 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select
 2021-11-12 10:10:04 +01:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
d1ef4bdbd1 Fix missing login in tooltip 2021-08-30 19:10:43 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
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