Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,811 Commits 36 Branches 189 Tags
53aed716e84f134e8de45cb15b12137bfae345dc
Commit Graph

813 Commits

Author SHA1 Message Date
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Laurent Destailleur
7884216197 Merge pull request #23003 from rycks/14_fix_api_status_on_delete 
fix #22766: better API response HTTP code
 2022-11-26 10:26:21 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
IC-Ilies
b5ab1f612c FIX#19828 2022-11-25 22:29:35 +01:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
053b402202 Fix for notes standardization #19835 2022-01-23 19:20:13 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
6e27abaed9 FIX redirect to payment page when membership payment mode forced 2021-11-27 17:19:16 +01:00
Laurent Destailleur
66d9964861 Clean code 2021-11-27 16:19:12 +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
29bf662cc4 Fix warnings 2021-11-07 19:01:44 +01:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
3f7a75b0a3 FIX translation into email for member at membership validation. 2021-09-15 19:02:17 +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
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
2859ff46b5 Fix link of type of membership 2021-06-24 12:08:11 +02:00
Laurent Destailleur
21edb498c0 Merge pull request #17987 from daraelmin/daraelmin-patch-1 
Fix 17986 error on comparing integer and string in strict sql
 2021-06-20 17:26:56 +02:00
Laurent Destailleur
002471b1fe Update adherentstats.class.php 2021-06-20 17:25:58 +02:00
daraelmin
cfd7c610db Use dolSqlDateFilter instead of SQL function YEAR 2021-06-20 17:14:28 +02:00
daraelmin
a54a955a65 Use year() instead of date_format 2021-06-20 15:40:32 +02:00
daraelmin
831cc4f4b7 Fix 17986 error on comparing integer and string in strict sql 2021-06-20 14:19:05 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +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
Laurent Destailleur
19a203bd40 Fix amount of memberships 2021-05-12 22:09:06 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01: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