Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,040 Commits 35 Branches 179 Tags 1.7 GiB
00a855bc5e
Commit Graph

1952 Commits

Author SHA1 Message Date
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/ajax/onlineSign.php
 2022-08-21 23:48:44 +02:00
Regis Houssin
293ad34ca8 FIX security for Multicompany 2022-08-18 17:02:20 +02:00
Laurent Destailleur
94da628cf4 Clean code for http header + better support for Content-Security-Policy 2022-08-16 15:19:45 +02:00
Laurent Destailleur
d7209f1818 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-14 21:42:45 +02:00
Laurent Destailleur
ebc8823202 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/ajax/onlineSign.php
 2022-08-14 21:41:25 +02:00
Laurent Destailleur
57fea5151d Fix regression in online signature 
Conflicts:
	htdocs/core/ajax/onlineSign.php
	htdocs/public/onlinesign/newonlinesign.php
 2022-08-14 20:50:28 +02:00
Laurent Destailleur
0abfaf6bd7 Fix regression in online signature 2022-08-14 20:45:04 +02:00
Laurent Destailleur
61739cc338 FIX online signature, better error management. 2022-08-14 20:03:13 +02:00
Laurent Destailleur
6a61c495b3 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-08-14 19:22:58 +02:00
Laurent Destailleur
a0d56b6db7 FIX the online signature feature 2022-08-14 19:14:20 +02:00
Laurent Destailleur
40179402ce Fix phpv8 warnings 2022-08-14 19:00:50 +02:00
Laurent Destailleur
7663a4c43d
Merge pull request #21734 from Deefaze/patch-1 
FIX : newonlinesign.php missing commercial file in loadings
 2022-08-14 15:36:58 +02:00
Laurent Destailleur
9732c3c06a Fix error code 2022-08-14 15:25:06 +02:00
Laurent Destailleur
5b74f1d3dc Fix duplicate string 
Conflicts:
	htdocs/public/members/new.php
 2022-08-13 12:35:07 +02:00
Laurent Destailleur
d510e3ffcc Fix duplicate string 2022-08-13 12:33:00 +02:00
Deefaze
7bac82bb13
Update newonlinesign.php 
missing "commercial" language file for complete translation
 2022-08-12 22:50:22 +02:00
Laurent Destailleur
239008b67d
Merge pull request #21574 from ymollard/create3rdpartyV14 
FIX: Create a 3rd party from the self-subscription membership form
 2022-08-12 00:16:54 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00
ptibogxiv
d872b9c2c7
Fix correct fix of paymentok.php 
this line was deleted by error
 2022-08-02 21:05:33 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
ef8da5f34c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-02 20:27:08 +02:00
ptibogxiv
af4d8ef53e
FIX validation paymentok.php if advance rights 2022-07-30 15:32:18 +02:00
Laurent Destailleur
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Yoan Mollard
e271175de6 Display all errors 2022-07-27 21:37:06 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Yoan Mollard
195b9f5ebc Propagate all errors messages 2022-07-26 00:02:14 +02:00
Laurent Destailleur
66c27139e1 Fix php8 2022-07-25 19:21:14 +02:00
Yoan Mollard
f30c95ad22 Create a 3rd party from the self-subscription membership form 
Only when ADHERENT_DEFAULT_CREATE_THIRDPARTY = 1
 2022-07-25 16:05:15 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
16c087e04c Clean htmlentities 2022-07-22 19:25:15 +02:00
Regis Houssin
7db5f7eb1c FIX regression + add $forceentity parameter 2022-07-18 19:26:13 +02:00
Regis Houssin
ade854a469 FIX security breach if we have same ref number in multiple entities 2022-07-18 16:48:53 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-07-16 02:26:35 +02:00
Laurent Destailleur
07216577e4 FIX #yogosha11806 2022-07-16 02:03:38 +02:00
Laurent Destailleur
98b686b531 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:16:54 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Laurent Destailleur
f0090ef928 FIX #yogosha11755 2022-07-11 20:32:49 +02:00
Yoan Mollard
fd4c071c55 Fix displayed amount when canEditAmount is true globally 2022-07-11 12:03:24 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
09932000dd FIX online signature works partially on ODT templates. 2022-07-10 18:06:41 +02:00
Yoan Mollard
f1b9a1e008 use the default amount only if the amount field is editable 2022-07-08 11:08:03 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
Laurent Destailleur
2f269c75de Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/bills.lang
 2022-07-07 20:12:23 +02:00
Laurent Destailleur
8ac9de38de Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-01 14:19:52 +02:00
Laurent Destailleur
09b8e3b1ee Better message 2022-07-01 13:26:32 +02:00