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

223 Commits

Author SHA1 Message Date
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +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
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Florian HENRY
78646d10bb tpl object linked 2021-07-29 17:26:17 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
fdaf29fd65 Fixing style errors. 2021-07-11 07:47:08 +00:00
fr69400
2eb10c40b2
Update conferenceorboothattendee_note.php 2021-07-11 09:46:52 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Florian HENRY
ca53abcef2 fix email template type 2021-07-05 15:35:05 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +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
1e90e618f0 wip filter 2021-05-10 17:25:00 +02:00
Dorian Vabre
48bbb500d3 fix on replacing thirdparty in attendees when merging multiple thirdparties 2021-05-10 16:25:44 +02:00
Dorian Vabre
bf25fd0834 confattendee merge OK to replace thirdparty 2021-05-10 16:04:13 +02:00
Dorian Vabre
2169a106fa note is now saved in database 2021-05-07 14:34:29 +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
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +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
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
stickler-ci
7f9f67e7ef Fixing style errors. 2021-04-23 15:12:34 +00:00
Dorian Vabre
b441c600bb fixing error introduced in a previous commit 2021-04-23 10:32:28 +02:00
Dorian Vabre
e05c318fd8 various modifications on the way existing attendees and thirdparties are handled at registration 2021-04-22 11:45:00 +02:00
Dorian Vabre
780b3f4714 target:blank added for the link to the registration pag 2021-04-21 13:41:30 +02:00
Dorian Vabre
9a32526938 added space for the link to the conference/booth registration page 2021-04-19 15:49:51 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
8aeed353c7
Merge pull request #17232 from dolibit-ut/patch-270 
Update eventorganizationindex.php
 2021-04-13 15:56:24 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer 
Dev event organizer: public registration page to a conference
 2021-04-13 15:31:40 +02:00
stickler-ci
839edb5abe Fixing style errors. 2021-04-13 10:06:42 +00:00
Dorian Vabre
14e64f4a33 security changes: encryption is now with instead of hard coded keys 2021-04-13 11:57:36 +02:00
Dorian Vabre
caeb357aab security improvement by adding id to securekey before encryption 2021-04-13 10:40:33 +02:00
UT from dolibit
511848d8dc
Update eventorganizationindex.php 
$title = $langs->trans('EventOrganizationArea');

llxHeader('', $title, '');
 2021-04-12 19:09:52 +02:00
Dorian Vabre
358a2bf365 hardcoded label put in ->trans 2021-04-12 17:10:57 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Dorian Vabre
bb70908dac modifications to match @eldy's expectations 2021-04-12 10:09:05 +02:00
Dorian Vabre
a590f945e9 thirdparty creation OK, wip on conforboothattendee creation 2021-04-09 16:12:25 +02:00
Dorian Vabre
af5b623b59 securekey added 2021-04-08 16:32:50 +02:00
Dorian Vabre
2f005db4a5 basic encryption of id in url + wip on creating a thirdparty 2021-04-08 11:06:34 +02:00
Dorian Vabre
c6d3510e30 form ok, todo : creation of an attendee 2021-04-07 17:16:26 +02:00
Dorian Vabre
07e018dc7d work in progress 2021-04-07 12:30:08 +02:00
Dorian Vabre
f7b6e239e9 nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable) 2021-04-07 10:06:38 +02:00
Florian HENRY
4cf8c4c685 add conf or booth contact tab and roles 2021-04-02 12:06:03 +02:00
Florian HENRY
88b481e5a8 keep tab project 2021-04-02 11:25:14 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Florian HENRY
c3f4e5e2d5 better attendded woth project tabs 2021-03-31 20:09:13 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Florian HENRY
1f08e37a03 more feature 2021-03-29 20:28:29 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Florian HENRY
e18c010490 fix bug on list 2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Florian HENRY
2970f1a968 retreive missing fileds... 2021-03-29 12:07:47 +02:00
Florian HENRY
aa9d4342cd fix translation 2021-03-26 20:18:22 +01:00
Florian HENRY
a8b486c7b9 fix error translation 2021-03-26 19:00:56 +01:00
Florian HENRY
3e12820f0e fix comment 2021-03-26 18:37:11 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Florian HENRY
32246e4d69 workiong attendees 2021-03-26 18:29:06 +01:00
Florian HENRY
53a9fd5823 almost done 2021-03-24 22:21:31 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Florian HENRY
26cffd139d working on attendees 2021-03-23 22:12:30 +01:00
Florian HENRY
ebe0b503f6 working on attendees 2021-03-23 22:12:20 +01:00
Florian HENRY
cc78e7c685 add field on conf or booth tabs 2021-03-23 21:04:38 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Frédéric FRANCE
48e1a796e0
fix doxygen 2021-03-20 09:16:38 +01:00
Laurent Destailleur
1540f62df0 FIX #yogosha5678 2021-03-19 14:25:59 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-16 10:34:55 +01:00
Frédéric FRANCE
4714e03848
Update conferenceorbooth_list.php 2021-03-15 22:37:51 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Florian HENRY
17c49e6ce9 ongoinf card and list 2021-03-15 18:06:23 +01:00
Laurent Destailleur
5daf881660
Merge pull request #16642 from frederic34/patch-5 
Add index.html in directories with no index files
 2021-03-15 11:40:03 +01:00
Frédéric FRANCE
0d310a7a82
Create index.html 2021-03-13 14:15:40 +01:00
Frédéric FRANCE
03992257f6
Create index.html 2021-03-13 14:15:25 +01:00
Frédéric FRANCE
69514b0003
Create index.html 2021-03-13 14:15:11 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
b5def91b46 Fix phpcs 2021-03-04 17:57:08 +01:00
stickler-ci
95d7380317 Fixing style errors. 2021-03-02 21:34:19 +00:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Florian HENRY
5ba9ffeb09 change comlumn name 2021-03-01 15:36:50 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d change comlumn name 2021-03-01 15:34:02 +01:00
Florian HENRY
045a96e415 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-02-27 15:35:17 +01:00
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00
stickler-ci
eca98237f0 Fixing style errors. 2021-02-27 13:57:52 +00:00
Florian HENRY
1041291bda manage status 2021-02-27 14:24:41 +01:00
Florian HENRY
f13ef50768 set good agenda type event 2021-02-27 13:13:42 +01:00
Frédéric FRANCE
6ad1f18187
code syntax eventorganization dir 2021-02-26 21:22:52 +01:00
Florian HENRY
67e84dc492 nouveau fichier : conferenceorbooth_agenda.php 
nouveau fichier : conferenceorbooth_contact.php
	nouveau fichier : conferenceorbooth_document.php
	nouveau fichier : conferenceorbooth_list.php
	nouveau fichier : conferenceorbooth_note.php
	nouveau fichier : eventorganizationindex.php
 2021-02-21 12:33:07 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Florian HENRY
02b698c128 move files to real diredtory 2021-02-14 17:09:23 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
3d264d8292 nouveau fichier : class/conferenceorbooth.class.php 
nouveau fichier : conferenceorbooth_agenda.php
	nouveau fichier : conferenceorbooth_card.php
	nouveau fichier : conferenceorbooth_contact.php
	nouveau fichier : conferenceorbooth_document.php
	nouveau fichier : conferenceorbooth_list.php
	nouveau fichier : conferenceorbooth_note.php
	nouveau fichier : core/modules/eventorganization/doc/doc_generic_conferenceorbooth_odt.modules.php
	nouveau fichier : core/modules/eventorganization/doc/pdf_standard_conferenceorbooth.modules.php
	nouveau fichier : core/modules/eventorganization/mod_conferenceorbooth_advanced.php
	nouveau fichier : core/modules/eventorganization/mod_conferenceorbooth_standard.php
	nouveau fichier : core/modules/eventorganization/modules_conferenceorbooth.php
	nouveau fichier : lib/eventorganization_conferenceorbooth.lib.php
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth.key.sql
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth.sql
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth.sql.back
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth_extrafields.key.sql
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth_extrafields.sql
 2021-02-14 15:00:46 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
Florian HENRY
9858aec6d6 on going 2021-02-12 11:31:13 +01:00
Florian HENRY
256e2e1b6e nouveau fichier : ../core/modules/modEventOrganization.class.php 
nouveau fichier : ../eventorganization/.editorconfig
	nouveau fichier : ../eventorganization/.gitattributes
	nouveau fichier : ../eventorganization/.gitignore
	nouveau fichier : ../eventorganization/.tx/config
	nouveau fichier : ../eventorganization/COPYING
	nouveau fichier : ../eventorganization/ChangeLog.md
	nouveau fichier : ../eventorganization/README.md
	nouveau fichier : ../eventorganization/eventorganizationindex.php
	nouveau fichier : ../eventorganization/lib/eventorganization.lib.php
	nouveau fichier : ../eventorganization/modulebuilder.txt
	nouveau fichier : ../eventorganization/myobject_contact.php
	nouveau fichier : ../../test/phpunit/EventOrganizationFunctionalTest.php
 2021-02-11 17:17:02 +01:00