lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

2333 Commits

Author SHA1 Message Date
lmarcouiller
d41c6a93d3 Fix : php 8.1 warn,ings 2022-08-29 16:23:33 +02:00
bagtaib
0fc2f008bd first try 2022-08-29 11:24:42 +01:00
Hystepik
0214c0993d
Merge branch 'develop' into develop#3 2022-08-29 10:25:29 +02:00
lmarcouiller
a3fb4ad030 use of getUserRemoteIp() 2022-08-29 10:22:01 +02:00
Philippe GRAND
622442bb49 FIX php8 compatibility 2022-08-28 14:29:59 +02:00
Philippe GRAND
6ac416f6e2 FIX php8 compatibility 2022-08-28 14:29:19 +02:00
Philippe GRAND
c2c13d41ef FIX php8 compatibility 2022-08-28 14:28:52 +02:00
Philippe GRAND
466284f260 FIX php8 compatibility 2022-08-28 14:28:22 +02:00
Philippe GRAND
65c05a374f FIX php8 compatibility 2022-08-28 14:27:54 +02:00
Philippe GRAND
a37fed87b3 FIX php8 compatibility 2022-08-28 14:27:28 +02:00
Philippe GRAND
decf806a06 FIX php8 compatibility 2022-08-28 14:26:42 +02:00
Philippe GRAND
492229b48c FIX php8 compatibility 2022-08-28 14:25:43 +02:00
stickler-ci
0427cce9b2 Fixing style errors. 2022-08-26 19:23:51 +00:00
Yoan Mollard
c581024c8c NEW: Public counters feature 2022-08-26 21:16:43 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
 2022-08-25 14:35:08 +02:00
Laurent Destailleur
d6cc6f2576 Change sql creation of a partnership from a public page 2022-08-25 11:46:44 +02:00
Laurent Destailleur
d3701eae9e
Merge pull request #21809 from badre-agtaib/partnership 
public partnership request
 2022-08-25 11:25:27 +02:00
bagtaib
5e910361ac fix fetch errror 2022-08-25 09:57:18 +01:00
bagtaib
17dccc2a6d added email check 2022-08-24 12:02:38 +01:00
bagtaib
f36303a951 debug 2022-08-24 00:23:39 +01:00
bagtaib
056fa0aba9 added mods suggested 2022-08-24 00:20:11 +01:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
9f3ed07e87 Trans 2022-08-23 11:00:28 +02:00
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
bagtaib
376a2288b7 . 2022-08-22 09:50:58 +01:00
bagtaib
6cc872abd8 . 2022-08-22 09:50:45 +01:00
bagtaib
9e71d491e6 hook 2022-08-22 00:36:23 +01:00
bagtaib
b342560e4d modified create partnership 2022-08-22 00:35:34 +01: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
bagtaib
b74d2636fe hook 2022-08-19 21:53:29 +01:00
bagtaib
27eb3ccd06 draft 2022-08-19 21:53:17 +01: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
lmarcouiller
bcd5aacb4c Fix : Spam db public page 2022-08-04 16:53:58 +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
Antonio
1769530cfd agregar un mensaje de error traducido al espanol 2022-07-30 12:12:19 -05: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
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
3ab2308124 Clean code 2022-02-18 12:36:05 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
aacd439765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/api/class/api_setup.class.php
 2022-02-17 20:46:20 +01:00
Laurent Destailleur
edc984c6e3 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-02-17 20:43:22 +01:00
Laurent Destailleur
2e744a4517
Update create_ticket.php 2022-02-17 19:18:22 +01:00
Thomas Negre
1c8c98ac0f fix ticket public interface: 
When sending an email to the customer,
If a custom URL had been provided for ticket public interface,
the link provided in the email did lead to the index of the public interface.
We want it to lead to /view.php
 2022-02-17 09:53:36 +01:00
Laurent Destailleur
6bd2caee08 test 2022-01-27 16:35:26 +01:00
Laurent Destailleur
2f1857a23a Log 2022-01-27 11:51:51 +01:00
Laurent Destailleur
b0e5d63ee2 Better log 2022-01-27 11:49:38 +01:00
Thomas Negre
ec723657c9 new : allow informations to be displayed before the public ticket list 2022-01-26 09:55:41 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
6aeae8fe7f Debug v15 2022-01-07 12:27:07 +01:00
Laurent Destailleur
13a3d0057b
Merge pull request #19644 from FHenry/dev_public_page_multientity_ticket 
FIX: manage multientity in ticket public page by querystring (#Evarisk)
 2022-01-06 16:53:35 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
6bd6bc3d57 Fix link to download document on signed proposal 2022-01-04 13:33:59 +01:00
Laurent Destailleur
1d80b8394a Debug v15 2022-01-04 12:56:08 +01:00
Laurent Destailleur
2e2e1b90e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-26 15:41:25 +01:00
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +01:00
Laurent Destailleur
3fc0205d0b Fix responsive 2021-12-25 12:44:46 +01:00
Laurent Destailleur
7266c78162 Clean/Debug code for v15 2021-12-17 17:40:30 +01:00
Florian HENRY
a3c8c45d5f style 2021-12-17 11:12:20 +01:00
Florian HENRY
dfbd03140c FIX: manage multientity in ticket public page by querystring 2021-12-17 11:10:08 +01:00
Laurent Destailleur
2bc417fcf7 FIX parameter $action replaced with $mode. $action reserved for action 2021-12-11 13:22:43 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
39c7d55c1d Fix php syntax 2021-12-06 12:17:07 +01:00
Laurent Destailleur
8b914172df Fix rename and protect a test page 2021-12-06 12:16:12 +01:00
Laurent Destailleur
1977cac44a Fix error message 2021-12-06 12:12:04 +01:00
Laurent Destailleur
dd60720299 Add tool to help debug 2021-12-06 12:07:13 +01:00
Laurent Destailleur
ac17378972 revert 2021-12-02 20:41:13 +01:00
Laurent Destailleur
2300f17101 test 2021-12-02 20:40:41 +01:00
Laurent Destailleur
9c083071b8 Better test 2021-12-02 20:39:53 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
f027dade8f css 2021-11-29 16:33:58 +01:00
Laurent Destailleur
52b855fb4b css 2021-11-29 16:31:40 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Laurent Destailleur
27ae8f61bd FIX Check on Stripe REAL amount currency before validating membership 2021-11-27 19:04:39 +01:00
Laurent Destailleur
309f7da7ba Add log hidden into result page 2021-11-27 18:29:31 +01:00
Laurent Destailleur
54e335937f FIX Bad redirect url for payment of members after public registration 2021-11-27 18:05:41 +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
Laurent Destailleur
2acfba25ee Comment dead code 2021-11-27 15:58:14 +01:00
Laurent Destailleur
b3e9e5c462 Enhance test 2021-11-24 21:37:43 +01:00
Laurent Destailleur
0c27182c6a Fix test 2021-11-24 20:58:34 +01:00
Laurent Destailleur
3b5c13d3e6 Add a test file. Disabling if on production. 2021-11-24 20:53:17 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
stickler-ci
dbcdf8aaa3 Fixing style errors. 2021-11-12 10:22:46 +00:00
ptibogxiv
bd125910ab
NEW stripe element with more gateways 2021-11-12 11:18:30 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
b513d21bca
Merge pull request #19208 from Quentin-Seekness/patch-1 
FIX: Can't create new attendee
 2021-10-31 17:33:42 +01:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Quentin-Seekness
0c915dc052
FIX: Can't create new attendee 
Field date_subscription is mandatory when creating a new attendee.
 2021-10-26 09:54:08 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Laurent Destailleur
622304126e Fix phpcs 2021-10-22 16:35:23 +02:00
Laurent Destailleur
da4ecb46b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-21 22:32:10 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
265f3d0ab0 Fix css 2021-10-19 20:03:59 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962 Debug feature for proposal signature 2021-10-18 20:46:28 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2 
NEW: Online proposal signature
 2021-10-18 19:41:58 +02:00
Laurent Destailleur
2262646391 Standardize name of page 2021-10-18 16:04:49 +02:00
Laurent Destailleur
c98f28ffc8 Clean code 2021-10-18 15:57:33 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
lmarcouiller
a324f74d88 update newonlinesign.php with border 2021-10-18 15:35:15 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
Laurent Destailleur
51f342c81a Clean code 2021-10-18 12:20:51 +02:00
Laurent Destailleur
11230ebf7f Clean code 2021-10-18 12:05:40 +02:00
lmarcouiller
9eb8dadfd9 WIP : signature of propal 2021-10-15 16:58:59 +02:00
Laurent Destailleur
0865916fe2 Init page for public subscription 2021-10-15 10:43:27 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
5463a02887 Debug v14 2021-10-06 21:59:10 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
8fe37b20c0 Debug v14 2021-10-06 21:54:04 +02:00
Laurent Destailleur
2a5e654544 Debug v14 2021-10-06 21:47:46 +02:00
Laurent Destailleur
f95b0c3033 Debug 2021-10-06 21:43:30 +02:00
Alexandre SPANGARO
f6a8082f16 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:01:37 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
97d912d553 Add more information about private or public poll. 2021-09-21 17:17:38 +02:00
Laurent Destailleur
09fff2150e Fix: avoid to add line for event registration twice into invoice 2021-09-21 15:30:34 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
0bf213acac Code comment 2021-09-18 13:25:12 +02:00
Laurent Destailleur
2810315dc5 Fix payment of registration of event 2021-09-18 13:19:29 +02:00
Laurent Destailleur
5fa62f25fa Fix registration of attendee 2021-09-18 12:39:26 +02:00
Laurent Destailleur
ceb368abd4 Fix message 2021-09-18 12:29:35 +02:00
Laurent Destailleur
dafc7d2617 Fix bad position of picto 2021-09-18 11:34:15 +02:00
Laurent Destailleur
ddcb4c149a css 2021-09-18 11:32:58 +02:00
Laurent Destailleur
0c67185dcf Add note on registration 2021-09-18 11:03:15 +02:00
Laurent Destailleur
c052a50d75 Fix phpcs 2021-09-17 10:32:19 +02:00
Laurent Destailleur
0c0ef7b683 Debug module event organization 2021-09-16 20:56:14 +02:00
Laurent Destailleur
16331ce87b Better detection of company 2021-09-16 18:53:00 +02:00
Laurent Destailleur
bfe305dc47 Debug event organization module 2021-09-16 18:16:25 +02:00
Laurent Destailleur
424ddcb218 Fix page of payment 2021-09-16 16:37:20 +02:00
Laurent Destailleur
253f01edcb Fix page of payment 2021-09-16 16:33:51 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
2b340579a1 Fix look 2021-09-15 21:12:16 +02:00
Laurent Destailleur
0ab399aa37 Fix try to find the thirdparty from contacts too. 2021-09-15 20:46:48 +02:00
Laurent Destailleur
5aaf8ff8f3 Fix sql 2021-09-15 19:58:55 +02:00
Laurent Destailleur
801bf83334 Css v14 2021-09-15 19:48:43 +02:00
Laurent Destailleur
eab4014f20 Rename url 2021-09-15 19:42:07 +02:00
Laurent Destailleur
29d9771b80 Code comment 2021-09-15 19:39:22 +02:00
Laurent Destailleur
4a2d3a55d4 FIX Selection of type "people" for membership must hide the company 2021-09-15 19:33:30 +02:00
Laurent Destailleur
3f2f6c3ed3 Fix online registration 2021-09-14 21:12:11 +02:00
Alexandre SPANGARO
d32ab42654 Merge remote-tracking branch 'upstream/develop' into 15a14 2021-09-10 16:59:31 +02:00
Alexandre SPANGARO
26d5ccee61 NEW Survey - Add a clickable link in email send 2021-09-10 16:58:29 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
 2021-09-10 11:40:45 +02:00
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
f5903c9b02 Debug organizedeventregistration module 2021-09-08 02:17:00 +02:00
Laurent Destailleur
880ac07661 Debug organizedeventregistration module 2021-09-08 01:41:59 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +02:00
Laurent Destailleur
f54e4690e6 Debug event organization module 2021-09-07 18:13:55 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Florian HENRY
628c715878 ok for prod 2021-09-03 16:39:10 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
Laurent Destailleur
72131110e7 Fix protect public pages 2021-08-31 18:03:37 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
daraelmin
29f98041e6
conditiion always wrong when on following link 2021-08-25 08:48:42 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
 2021-08-22 01:41:18 +02:00
Laurent Destailleur
e6fa070c84 Fix phpcs 2021-08-22 01:21:31 +02:00
Laurent Destailleur
49f6a634d0 Fix output of error message. br is no more encoded 2021-08-21 15:00:47 +02:00
Laurent Destailleur
17213ae65d More error messages on paypal payment. 2021-08-21 12:37:28 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Florian HENRY
510cf36bbd Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-30 09:26:55 +02:00
Laurent Destailleur
047c575d61 Fix some errors on ticket module 2021-07-30 01:42:52 +02:00
Laurent Destailleur
593e84906b FIX bad closing div on error message 2021-07-30 01:16:04 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Laurent Destailleur
ddf067e9de
Merge pull request #17801 from nicolas-eoxia/fix_process_payment_with_online_link_order 
NEW : Auto create invoice for payment done on an order with online payment link of order
 2021-07-14 14:05:13 +02:00
Laurent Destailleur
b2425c2a9d
Update paymentok.php 2021-07-14 14:04:44 +02:00
ATM john
1a330e0b88 Fix dialog BTN and add doc 2021-07-14 00:02:55 +02:00
Laurent Destailleur
c23f46af9b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 15:35:39 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Florian HENRY
03f8557aaf fix template email 2021-07-05 15:36:41 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Florian HENRY
783257706c fix: payment ok should trigger PAYMENTONLINE_PAYMENT_OK even on custom object 2021-07-02 10:53:51 +02:00
stickler-ci
b102dc619f Fixing style errors. 2021-07-01 10:15:55 +00:00
Nicolas Domenech
5c0086790e
Merge branch 'develop' into fix_process_payment_with_online_link_order 2021-07-01 12:13:59 +02:00
Nicolas
3e6eeeb977 fix : remove comments 2021-07-01 11:59:00 +02:00
Nicolas
9b71f1e16b fix : move check if invoice module is enabled into paymentok.php 2021-07-01 11:55:06 +02:00
Laurent Destailleur
edb4cf4130 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	README.md
	htdocs/filefunc.inc.php
 2021-06-19 20:05:25 +02:00
Laurent Destailleur
5d6b26ddb7 Fix css 2021-06-19 19:45:13 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
dc6512e5af
Merge pull request #17940 from Hystepik/develop#3 
Fix #17907 : import of the undefined function
 2021-06-15 22:00:17 +02:00
Frédéric FRANCE
f79e16e3b1
replace recruitement by recruitment 2021-06-15 19:08:08 +02:00
lmarcouiller
674bd53b32 Fix #17907 : import of the undefined function 2021-06-15 16:11:25 +02:00
Laurent Destailleur
465ee6e643 Fix security check on public pages 2021-06-13 20:37:53 +02:00
Laurent Destailleur
3eea92c6e6 Clean code 2021-06-13 20:36:12 +02:00
Laurent Destailleur
6f97a551ef Clean code 2021-06-13 20:32:11 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
693ac3eab6 Code comment 2021-06-10 16:38:09 +02:00
Laurent Destailleur
c0c773dd1d css 2021-06-10 11:32:09 +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
beca3c8ad3 Debug v14 2021-06-07 01:51:56 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
Laurent Destailleur
5d063ab880 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php 2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php 2021-06-05 00:53:07 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription 
#Fix #17743 - token was hashed with membersubscription

for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
 2021-06-04 23:14:31 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest 
new: working on conference or booth object and event type #FoundationFunding
 2021-06-04 13:12:32 +02:00
Laurent Destailleur
402d90554a Clean code 2021-06-04 10:04:56 +02:00
Nicolas
e46faacac1 FIX : Add process payment with online link order 2021-06-02 18:11:47 +02:00
Laurent Destailleur
5a5fa1edbb Fix regression amount was always empty. 2021-05-27 11:57:17 +02:00
Laurent Destailleur
531dee31fd Fix securekey 2021-05-27 11:16:23 +02:00
Dorian Vabre
12d10adc17 Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-05-21 16:02:22 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
stickler-ci
6f050fc23a Fixing style errors. 2021-05-20 15:48:04 +00:00
Dorian Vabre
83555da795 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
ab4ae85eb8 fix: getpost exportagenda apha to alpha 2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622 wip 2021-05-20 16:30:49 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Dorian Vabre
f6956d6a62 using validate() function instead of settStatut(1) to validate an attendee 2021-05-10 15:58:54 +02:00
Dorian Vabre
7d0c3dcf6d transition done from cookies to session 2021-05-10 15:50:29 +02:00
Dorian Vabre
d71dc37a75 fix 2021-05-10 15:39:39 +02:00
Dorian Vabre
ee4e8dd99f cookies to session transition 2021-05-10 15:37:25 +02:00
Dorian Vabre
c5dc20b9dc opti 2021-05-10 15:31:52 +02:00
Dorian Vabre
0e62edfd42 fix error on fetching thirdparty when there is none 2021-05-10 12:47:09 +02:00
Dorian Vabre
0dce9ee359 now using correct email templates after booth/conf suggestion 2021-05-10 10:22:45 +02:00
Dorian Vabre
d86b393d60 useless line removed 2021-05-10 09:54:26 +02:00
Dorian Vabre
058bef1a79 clean viewandvote page 2021-05-07 17:20:36 +02:00
Dorian Vabre
05bbb3dbf6 improved welcome msg on suggestbooth/conf pages 2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b added copyright 2021-05-07 16:15:13 +02:00
Dorian Vabre
d344ce5e08 clean viewandvote page 2021-05-07 15:59:25 +02:00
Dorian Vabre
dfd3742d91 fix on label on payment page 2021-05-07 15:33:00 +02:00
Dorian Vabre
dbde0f0b02 fix on status change when a booth is paid 2021-05-07 15:05:37 +02:00
Dorian Vabre
6111f43946 security fix, id was encoded where it should not be encoded 2021-05-07 14:49:00 +02:00
Dorian Vabre
5bb100de29 conforbooth class required in paymentok to confirm the booth 2021-05-07 13:02:34 +02:00
Dorian Vabre
27cffbddf3 vote page ok 2021-05-07 12:21:15 +02:00
daraelmin
6504f96188
Copyright 2021-05-07 00:43:01 +02:00
stickler-ci
949e797390 Fixing style errors. 2021-05-06 22:31:41 +00:00
daraelmin
912995a558
Create new.php 2021-05-07 00:28:03 +02:00
daraelmin
9af05f3c6e
Update new.php 2021-05-07 00:25:38 +02:00
daraelmin
2e2b6af98e
Update new.php 2021-05-07 00:23:46 +02:00
daraelmin
82bf9cd3e9
Fix public new member form use adh type amount 2021-05-07 00:13:49 +02:00
Dorian Vabre
166e15633b factorisation 2021-05-06 17:30:11 +02:00
Dorian Vabre
2e7d5e6d46 Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-05-06 16:48:30 +02:00
Laurent Destailleur
b7601cb662
Merge pull request #17496 from daraelmin/daraelmin-patch-4 
Fix amnt can be paid for member as membersubscription
 2021-05-06 16:47:41 +02:00
Dorian Vabre
295c63468b wip vote page 2021-05-06 16:32:39 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Dorian Vabre
2f7dd4e807 wip vote page 2021-05-06 14:53:23 +02:00
Dorian Vabre
a00c9c44c3 now adding contact to conforbooth, not only to thirdparty 2021-05-06 14:26:41 +02:00
Dorian Vabre
9c20e92e17 country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change 2021-05-06 14:06:53 +02:00
Dorian Vabre
abeb1c644c country now only required when paying a booth, dates of start and end required 2021-05-06 13:50:13 +02:00
Dorian Vabre
4d8d94bfbf fixes: show only correspond button on specific page, id no longer encoded in hidden parameter 2021-05-06 12:13:49 +02:00
Dorian Vabre
c56c7afa89 update on specifications on suggesting a booth/conf since its now two separated pages 2021-05-06 11:59:24 +02:00
Dorian Vabre
df78aaff88 now 2 distinct pages to suggest a conf or a booth 2021-05-06 11:49:00 +02:00
Dorian Vabre
10c9e9b77c wip 2021-05-06 11:31:23 +02:00
Dorian Vabre
a68a7c1f67 wip 2021-05-06 11:27:48 +02:00
Dorian Vabre
4c50d210dd creation of the 3 main pages 2021-05-06 11:26:42 +02:00
daraelmin
d840593ed7
Fix amnt can be paid for member as membersubscription 2021-05-04 23:19:19 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
daraelmin
0610ca89c1
camelCase for amountByType 2021-05-01 20:45:57 +02:00
daraelmin
031d258b32
Update newpayment.php 2021-05-01 20:17:29 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Dorian Vabre
d1fe595c09 fix on the clear ids 2021-04-29 10:00:49 +02:00
Dorian Vabre
df28491524 every id is now clear in url + in the hash of the securekey 2021-04-29 09:40:47 +02:00
Laurent Destailleur
0d30bc5dc3
Merge pull request #17366 from daraelmin/daraelmin-patch-laterenew 
Fix #17318 false renew date
 2021-04-27 21:26:56 +02:00
daraelmin
5b74676e54
fix infinite loop 2021-04-27 20:14:03 +02:00
Laurent Destailleur
e6d2bad6e0
Update paymentok.php 2021-04-27 19:46:26 +02:00
Dorian Vabre
15e65729f6 put company under email in the form 2021-04-27 17:19:13 +02:00
Dorian Vabre
54b5a43006 wip 2021-04-27 17:06:25 +02:00
Dorian Vabre
5203a417fe select array OK for event type 2021-04-27 16:31:14 +02:00
Dorian Vabre
f2f1eaa95e wip 2021-04-27 16:01:01 +02:00
Dorian Vabre
8fc45da56e Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-04-27 15:01:59 +02:00
Dorian Vabre
7405725198 added security check at beginning of /project/index page (according to the security I added in the previous commits) 2021-04-27 14:11:46 +02:00
Dorian Vabre
79dce3ad05 typo in comment 2021-04-27 14:06:40 +02:00
Dorian Vabre
fab12bc5e5 removed the indicated id of conf when on the subscription page for security (now showing label instead) 2021-04-27 14:04:08 +02:00
Dorian Vabre
a508cdbf59 every dol_encode for securekey replaced with dol_hash (dol_encode kept for encoding ids 2021-04-27 14:01:44 +02:00
Dorian Vabre
b24b297a40 adaptation of the payment for the booth location case 2021-04-27 12:30:49 +02:00
Dorian Vabre
151819b7ad added payment redirection to pay a booth, or status update for free booth/conference 2021-04-27 11:22:40 +02:00
Dorian Vabre
bfadcfc4bb added red star on label and note, that are required 2021-04-27 10:49:10 +02:00
Dorian Vabre
d034446205 not giving the invoiceref anymore in the url from newpayment to paymentok, since it was already in ref= anyway 2021-04-27 10:08:32 +02:00
Dorian Vabre
99589fd693 added fk_project in $facture 2021-04-27 09:57:27 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
daraelmin
db92de2a22
Draft and resiliated member could (re)validate 2021-04-27 02:36:47 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
daraelmin
25e3beb3ee
$object::STATUS_RESILIATE 2021-04-27 01:55:51 +02:00
Laurent Destailleur
819a5bd0bd
Merge pull request #17373 from indelog/public_donationpaiement 
Add : register donation payment when public payment
 2021-04-26 22:46:48 +02:00