__(Sincerely)__ __USER_SIGNATURE__', null, '1', null);
+ALTER TABLE llx_projet ADD COLUMN allow_unknown_people_conf integer DEFAULT 0;
+ALTER TABLE llx_projet ADD COLUMN allow_unknown_people_booth integer DEFAULT 0;
+ALTER TABLE llx_projet ADD COLUMN price_registration double(24,8);
+ALTER TABLE llx_projet ADD COLUMN price_booth double(24,8);
+
-- Uniformize field total_ht, total_tva, total_ttc
ALTER TABLE llx_propal CHANGE COLUMN tva total_tva double(24,8) default 0;
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index 76d254aafd3..e6dccbaf233 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -48,6 +48,10 @@ create table llx_projet
usage_task integer DEFAULT 1, -- Set to 1 if project is used to manage tasks and/or record timesheet
usage_bill_time integer DEFAULT 0, -- Set to 1 if time spent must be converted into invoices
usage_organize_event integer DEFAULT 0, -- Set to 1 if you want to use project to organize an event, receive attendees subscription
+ allow_unknown_people_conf integer DEFAULT 0, -- Set to 1 if you want to allow unknown people to suggest conferences
+ allow_unknown_people_booth integer DEFAULT 0, -- Set to 1 if you want to Allow unknown people to suggest booth
+ price_registration double(24,8),
+ price_booth double(24,8),
model_pdf varchar(255),
last_main_doc varchar(255), -- relative filepath+filename of last main generated document
import_key varchar(14) -- Import key
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 7dacefa4d56..0c7e4f047ce 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -57,3 +57,16 @@ EventOrganizationEmailSubsBooth = Subscription for booth
EventOrganizationEmailSubsEvent = Subscription for an event
EventOrganizationMassEmailAttendees = Communication to attendes
EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Price of subscription
+PriceOfBoothHelp=Price of subscription
+EventOrganizationICSLink=Link ICS for events
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 0462f9d3391..5370dcfa8f9 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -228,7 +228,7 @@ if (empty($reshook))
}
}
- if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
+ if ($action == 'update' && empty(GETPOST('cancel')) && $user->rights->projet->creer)
{
$error = 0;
@@ -1132,7 +1132,7 @@ if ($action == 'create' && $user->rights->projet->creer)
if ($action == 'edit' && $userWrite > 0)
{
print '
';
- print ' ';
+ print ' ';
print '';
print '
';
}
@@ -1223,14 +1223,14 @@ if ($action == 'create' && $user->rights->projet->creer)
// Send
if (empty($user->socid)) {
- if ($object->statut != 2)
+ if ($object->statut != Project::STATUS_CLOSED)
{
print ''.$langs->trans('SendMail').'';
}
}
// Modify
- if ($object->statut != 2 && $user->rights->projet->creer)
+ if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer)
{
if ($userWrite > 0)
{
@@ -1241,7 +1241,7 @@ if ($action == 'create' && $user->rights->projet->creer)
}
// Validate
- if ($object->statut == 0 && $user->rights->projet->creer)
+ if ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)
{
if ($userWrite > 0)
{
@@ -1252,7 +1252,7 @@ if ($action == 'create' && $user->rights->projet->creer)
}
// Close
- if ($object->statut == 1 && $user->rights->projet->creer)
+ if ($object->statut == Project::STATUS_VALIDATED && $user->rights->projet->creer)
{
if ($userWrite > 0)
{
@@ -1263,7 +1263,7 @@ if ($action == 'create' && $user->rights->projet->creer)
}
// Reopen
- if ($object->statut == 2 && $user->rights->projet->creer)
+ if ($object->statut == Project::STATUS_CLOSED && $user->rights->projet->creer)
{
if ($userWrite > 0)
{
@@ -1340,9 +1340,9 @@ if ($action == 'create' && $user->rights->projet->creer)
}
// Delete
- if ($user->rights->projet->supprimer || ($object->statut == 0 && $user->rights->projet->creer))
+ if ($user->rights->projet->supprimer || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer))
{
- if ($userDelete > 0 || ($object->statut == 0 && $user->rights->projet->creer))
+ if ($userDelete > 0 || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer))
{
print ''.$langs->trans("Delete").'';
} else {
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ff4be5e8d77..878a491de49 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -201,6 +201,10 @@ class Project extends CommonObject
'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
'usage_task' =>array('type'=>'integer', 'label'=>'UsageTasks', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
'usage_organize_event' =>array('type'=>'integer', 'label'=>'UsageOrganizeEvent', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
+ 'allow_unknown_people_conf' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestConf', 'enabled'=>1, 'visible'=>-1, 'position'=>146),
+ 'allow_unknown_people_booth' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>147),
+ 'price_registration' =>array('type'=>'double(24,8)', 'label'=>'PriceOfRegistration', 'enabled'=>1, 'visible'=>-1, 'position'=>148),
+ 'price_booth' =>array('type'=>'double(24,8)', 'label'=>'PriceOfBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>149),
'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>-2, 'position'=>200),
'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>205),
'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>210),
@@ -257,6 +261,10 @@ class Project extends CommonObject
if (empty($conf->eventorganization->enabled)) {
$this->fields['usage_organize_event']['visible'] = 0;
+ $this->fields['allow_unknown_people_conf']['enabled'] = 0;
+ $this->fields['allow_unknown_people_booth']['enabled'] = 0;
+ $this->fields['price_registration']['enabled'] = 0;
+ $this->fields['price_booth']['enabled'] = 0;
}
}
@@ -316,6 +324,10 @@ class Project extends CommonObject
$sql .= ", usage_task";
$sql .= ", usage_bill_time";
$sql .= ", usage_organize_event";
+ $sql .= ", allow_unknown_people_conf";
+ $sql .= ", allow_unknown_people_booth";
+ $sql .= ", price_registration";
+ $sql .= ", price_booth";
$sql .= ", email_msgid";
$sql .= ", note_private";
$sql .= ", note_public";
@@ -339,6 +351,10 @@ class Project extends CommonObject
$sql .= ", ".($this->usage_task ? 1 : 0);
$sql .= ", ".($this->usage_bill_time ? 1 : 0);
$sql .= ", ".($this->usage_organize_event ? 1 : 0);
+ $sql .= ", ".($this->allow_unknown_people_conf ? 1 : 0);
+ $sql .= ", ".($this->allow_unknown_people_booth ? 1 : 0);
+ $sql .= ", ".(strcmp($this->price_registration, '') ? price2num($this->price_registration) : 'null');
+ $sql .= ", ".(strcmp($this->price_booth, '') ? price2num($this->price_booth) : 'null');
$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
@@ -442,6 +458,10 @@ class Project extends CommonObject
$sql .= ", usage_task = ".($this->usage_task ? 1 : 0);
$sql .= ", usage_bill_time = ".($this->usage_bill_time ? 1 : 0);
$sql .= ", usage_organize_event = ".($this->usage_organize_event ? 1 : 0);
+ $sql .= ", allow_unknown_people_conf = ".($this->allow_unknown_people_conf ? 1 : 0);
+ $sql .= ", allow_unknown_people_booth = ".($this->allow_unknown_people_booth ? 1 : 0);
+ $sql .= ", price_registration = ".(strcmp($this->price_registration, '') ? price2num($this->price_registration) : "null");
+ $sql .= ", price_booth = ".(strcmp($this->price_booth, '') ? price2num($this->price_booth) : "null");
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -531,7 +551,8 @@ class Project extends CommonObject
$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
- $sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid";
+ $sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid,";
+ $sql .= " allow_unknown_people_conf, allow_unknown_people_booth, price_registration, price_booth";
$sql .= " FROM ".MAIN_DB_PREFIX."projet";
if (!empty($id))
{
@@ -588,6 +609,10 @@ class Project extends CommonObject
$this->usage_task = (int) $obj->usage_task;
$this->usage_bill_time = (int) $obj->usage_bill_time;
$this->usage_organize_event = (int) $obj->usage_organize_event;
+ $this->allow_unknown_people_conf = (int) $obj->allow_unknown_people_conf;
+ $this->allow_unknown_people_booth = (int) $obj->allow_unknown_people_booth;
+ $this->price_registration = $obj->price_registration;
+ $this->price_booth = $obj->price_booth;
$this->email_msgid = $obj->email_msgid;
$this->db->free($resql);
diff --git a/htdocs/projet/event.php b/htdocs/projet/event.php
new file mode 100644
index 00000000000..2aa0b29190a
--- /dev/null
+++ b/htdocs/projet/event.php
@@ -0,0 +1,346 @@
+
+ * Copyright (C) 2012 Laurent Destailleur
+ * Copyright (C) 2021 florian.henry@scopen.fr
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/projet/event.php
+ * \ingroup project
+ * \brief Tab event organization
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+// Load translation files required by the page
+$langs->load('projects','enevntorganization');
+
+$action = GETPOST('action', 'aZ09');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
+
+$object = new Project($db);
+
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
+
+// Security check
+$socid = 0;
+if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
+$result = restrictedArea($user, 'eventorganization', $id);
+
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+
+/*
+ * Actions
+ */
+
+if ($action == 'update' && empty(GETPOST('cancel')) && $permissiontoadd) {
+ $error = 0;
+ $object->oldcopy = clone $object;
+
+ $object->allow_unknown_people_conf=(GETPOST('allow_unknown_people_conf', 'alpha') == 'on' ? 1 : 0);
+ $object->allow_unknown_people_booth=(GETPOST('allow_unknown_people_booth', 'alpha') == 'on' ? 1 : 0);
+ $object->price_registration=price2num(GETPOST('price_registration', 'alphanohtml'));;
+ $object->price_booth=price2num(GETPOST('price_booth', 'alphanohtml'));;
+
+ $result = $object->update($user);
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $db->rollback();
+ $action = 'edit';
+ } else {
+ $db->commit();
+ if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
+ else unset($object->thirdparty);
+ $action='';
+ }
+}
+
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans("Project").' - '.$langs->trans("ConferenceOrBoothTab").' - '.$object->ref.' '.$object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
+//TODO Make wiki docs
+$help_url = '';
+llxHeader("", $title, $help_url);
+
+$form = new Form($db);
+$userstatic = new User($db);
+
+$now = dol_now();
+
+if ($id > 0 || !empty($ref))
+{
+
+ $head = project_prepare_head($object);
+ print dol_get_fiche_head($head, 'eventorganisation', $langs->trans('ConferenceOrBoothTab'), -1);
+
+ // Project card
+
+ $linkback = ''.$langs->trans("BackToList").'';
+
+ $morehtmlref = '
';
+ if (!$i) $totalarray['nbfield']++;
+ if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.price_booth';
+ }
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook