Laurent Destailleur
4939cc9911
Fix trans
2021-09-10 11:04:59 +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
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
dad4c34ec5
Debug module conference or booth
2021-08-31 23:51:45 +02:00
daraelmin
29f98041e6
conditiion always wrong when on following link
2021-08-25 08:48:42 +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
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
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
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
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
