Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

86 Commits

Author SHA1 Message Date
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
ef4906e22c Trans 2023-05-11 21:30:35 +02:00
Laurent Destailleur
586d9f5ba7 Look and feel v18 2023-04-24 01:59:39 +02:00
Laurent Destailleur
251f5c7056 Trans 2023-01-17 12:25:51 +01:00
Laurent Destailleur
68ebd850f4 Debug v17 2022-12-22 16:21:25 +01:00
Laurent Destailleur
84d47e9b0c Fix max nb of attendees reached 2022-10-20 19:26:24 +02:00
Laurent Destailleur
2d378ecede CSS 2022-10-20 19:16:25 +02:00
Laurent Destailleur
d2ec128595 Fix field fk_user_create of event registration must be null 2022-10-20 18:14:00 +02:00
Yoan Mollard
e9528443b2 Insert speaker contact type into db 2022-07-27 22:12:36 +02:00
Yoan Mollard
5600fd63df Retrieve category and insert default const at init of eventorganization module 2022-07-27 21:36:57 +02:00
Yoan Mollard
ae70dc11c6 Fixed labels 2022-07-25 22:28:07 +02:00
Laurent Destailleur
d76e7224d9 NEW Can set the max number of attendees for an organized event 2022-05-04 01:53:45 +02:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Laurent Destailleur
e442fcb07e Trans 2021-10-18 12:22: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
ed6fefc493 Trans 2021-10-07 04:10:39 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Laurent Destailleur
ff29ac93ad Debug eventorganization modules 2021-10-06 12:43:40 +02:00
Laurent Destailleur
5c4922682c Trans 2021-09-23 13:29:18 +02:00
Laurent Destailleur
16331ce87b Better detection of company 2021-09-16 18:53:00 +02:00
Laurent Destailleur
0fc51b6564 Fix email content 2021-09-16 12:10:40 +02:00
Laurent Destailleur
b18e0e3d1e Add missing translation key 2021-09-16 12:04:46 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
3f2f6c3ed3 Fix online registration 2021-09-14 21:12:11 +02:00
Laurent Destailleur
5f612dfd7c Trans 2021-09-14 17:38:17 +02:00
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
0b68da4e9e Debug organizedeventregistration module 2021-09-08 02:27:52 +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
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +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
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +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
6111f43946 security fix, id was encoded where it should not be encoded 2021-05-07 14:49:00 +02:00
Dorian Vabre
27cffbddf3 vote page ok 2021-05-07 12:21:15 +02:00
Dorian Vabre
295c63468b wip vote page 2021-05-06 16:32:39 +02:00
Dorian Vabre
2f7dd4e807 wip vote page 2021-05-06 14:53:23 +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
54b5a43006 wip 2021-04-27 17:06:25 +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
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