lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
113,061 Commits 43 Branches 150 Tags 886 MiB
402d52e160
Commit Graph

1993 Commits

Author SHA1 Message Date
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
Laurent Destailleur
3e70223961 Help debug 2022-07-01 13:15:15 +02:00
Yoan Mollard
6a8882b60d Bugfix: regression, keep newamount equal to amount for the payment 
Follows 759900bcce
 2022-06-30 00:39:13 +02:00
stickler-ci
f4c7c03dc1 Fixing style errors. 2022-06-29 14:38:43 +00:00
Yoan Mollard
f4d5962254 Allow to skip membership table for retrocompatibility 2022-06-29 03:27:48 +02:00
Yoan Mollard
e7058c253e NEW: Table of membership types 2022-06-29 03:25:33 +02:00
Yoan Mollard
759900bcce No longer allow to edit amount in the payment step 
If amount is editable, edition has been done in the previous screen in
public/members/new.php
It also allows the possibility to prevent the visitor from doing a >0
payment if this is not wanted.
 2022-06-29 00:27:18 +02:00
Yoan Mollard
ea0c710104 dopayment string fix 2022-06-29 00:23:27 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Yoan Mollard
0fca79529a Missing lib import 2022-06-28 01:51:14 +02:00
Yoan Mollard
6053f3e5f8 Internationalize invoice lines for new memberships 2022-06-27 00:27:00 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
fc0f624445 Debug v16 2022-06-04 02:08:08 +02:00
Laurent Destailleur
afd9787e99 Help debug cron 2022-06-03 11:52:39 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Giovanni Piemontese
945144d5a3 Fixed pagination on public ticket list page - ISSUE 19468 2022-05-20 18:46:02 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
402398912b
Merge pull request #20866 from Easya-Solutions/new-ticket-public-interface 
NEW create third-party with contact if not found on pulic ticket
 2022-05-16 20:44:40 +02:00
Laurent Destailleur
71c0f08b6c Debug v16 2022-05-16 19:47:06 +02:00
Laurent Destailleur
84fccb0988 Debug v16 2022-05-16 13:57:11 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Laurent Destailleur
af4e9b7510 Debug v16 2022-05-10 17:05:39 +02:00
Laurent Destailleur
1f59e329cd Work on public form for partnership 2022-05-10 16:50:33 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
649e6eb3ac
Merge pull request #20787 from dolibit-ut/patch-399 
Update index.php
 2022-05-08 19:10:09 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
UT from dolibit
0483e89c82
Update index.php 2022-05-06 08:19:47 +02:00
Laurent Destailleur
763c86144e Fix add invoice to email 2022-05-04 15:51:24 +02:00
Laurent Destailleur
8f7e162406 Fix css 2022-05-04 15:27:23 +02:00
Laurent Destailleur
fba2d143bd
Merge pull request #20763 from frederic34/patch-1 
default value is second parameter of getDolGlobalString
 2022-05-04 00:01:49 +02:00
Laurent Destailleur
c55da219d9 FIX sending email on payment of registration of event 2022-05-03 20:35:28 +02:00
Laurent Destailleur
207373d37d FIX sending email on payment of registration of event 2022-05-03 20:07:21 +02:00
Laurent Destailleur
5dfd38c8f9 Clean code for top menu 2022-05-02 16:54:27 +02:00
Frédéric FRANCE
19143d7003
default value is second parameter of getDolGlobalString 2022-05-02 15:31:21 +02:00
Laurent Destailleur
21e3a5d5ec Try to fix warnings 2022-05-01 21:04:16 +02:00
Laurent Destailleur
82b65f3517
Merge pull request #20707 from hregis/fix_wrong_data_root_with_multicompany 
NEW Module website now supports the multicompany module
 2022-05-01 12:33:07 +02:00
Laurent Destailleur
a090b21aec NEW Add a public page with all list of open job positions 2022-05-01 12:12:44 +02:00
Laurent Destailleur
7c058c9ae6 NEW Add param to keep the robot=index meta tag on public pages 2022-05-01 11:48:11 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2022-04-14 16:10:23 +02:00
Ferran Marcet
b8bccd62ef
Update newonlinesign.php 2022-04-11 18:41:36 +02:00
Ferran Marcet
9547b9e7fe Fix: Online signature of proposals does not work well with multicompany 2022-04-11 18:01:25 +02:00
Laurent Destailleur
bedb08df50 Clean and debug online payment code 2022-04-08 15:15:55 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +02:00
Laurent Destailleur
5ea42825fb
Merge pull request #19362 from ptibogxiv/patch-451 
NEW stripe element with more gateways
 2022-04-08 09:45:22 +02:00
Laurent Destailleur
c8bd222c05 Upgrade jquery to 3.6 and jquery-ui to 1.13.1 2022-04-02 19:50:26 +02:00
Laurent Destailleur
9fd4368195 Fix message on best vote 2022-04-01 19:30:22 +02:00
Laurent Destailleur
256b2f4493 NEW Show number of votes into the label of tab "Results" of a survey 2022-04-01 19:17:25 +02:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
940417efe2 FIX payment not completed when using Paypal. 2022-03-02 15:13:17 +01:00
Laurent Destailleur
117e1057e1 FIX #yogosha9083 2022-02-24 18:29:24 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
00e6d2786d Do not use dol_hash anymore for the name of cookies. 2022-02-21 12:21:43 +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