Commit Graph

101 Commits

Author SHA1 Message Date
Alexandre SPANGARO
96afcaa476 Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Laurent Destailleur
3d1cf79206 Typo 2024-06-30 15:05:50 +02:00
Laurent Destailleur
ca2313bdcc Code comment 2024-06-29 19:24:16 +02:00
Laurent Destailleur
b1783cb813 Export profile for confrerence or booth of an event 2024-06-05 16:32:25 +02:00
Laurent Destailleur
1e58997570 Clean code 2024-05-22 00:31:37 +02:00
Laurent Destailleur
3acb98b160 NEW Show the profit per attendee on events 2024-03-27 19:06:06 +01:00
Laurent Destailleur
ae41b07b70 Fix trans 2024-03-18 20:51:47 +01:00
Laurent Destailleur
e846721dc9 NEW Add link to export ICS file of an event. 2024-02-18 00:25:00 +01:00
MDW
7b54824d49 Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Qual: Introduce getDataToShowPhoto to prepare generic code

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix missing trans

* Fix langs

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP EMAILINGS_SUPPORT_ALSO_SMS

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP SMSing

* Debug the "validate" feature

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Enhance rector to fix empty($user->rights->modulex->perm1)

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
MDW
c7ac316290 QUAL: correct base language (en_US) to American English + other corrections 2023-12-01 20:18:42 +01:00
MDW
9cb872c8d3 Fix spelling in base language (#26671) 2023-11-17 16:20:49 +01:00
sonikf
26674ba5d1 fix typo (#26389) 2023-10-30 02:24:22 +01:00
Laurent Destailleur
1734adfd27 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-24 03:05:46 +02:00
Laurent Destailleur
ff522d6e21 Fix trans 2023-10-19 13:46:41 +02:00
Hystepik
1395a9ff8f New : mass modification of status for coferenceorbooth 2023-06-23 16:32:01 +02:00
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