lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename column

Browse Source
This commit is contained in:
Florian HENRY 2021-02-22 21:00:54 +01:00
parent 67e84dc492
commit c9a51d971d
5 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
View File

@ -174,8 +174,8 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private,
INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendes', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendes)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__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 accept_conference_suggestions integer DEFAULT 0;
ALTER TABLE llx_projet ADD COLUMN accept_booth_suggestions 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);

4
htdocs/install/mysql/tables/llx_projet.sql
View File

@ -48,8 +48,8 @@ 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
accept_conference_suggestions integer DEFAULT 0, -- Set to 1 if you want to allow unknown people to suggest conferences
accept_booth_suggestions 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),

26
htdocs/projet/class/project.class.php
View File

@ -201,8 +201,8 @@ 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),
'accept_conference_suggestions' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestConf', 'enabled'=>1, 'visible'=>-1, 'position'=>146),
'accept_booth_suggestions' =>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),
@ -261,8 +261,8 @@ 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['accept_conference_suggestions']['enabled'] = 0;
$this->fields['accept_booth_suggestions']['enabled'] = 0;
$this->fields['price_registration']['enabled'] = 0;
$this->fields['price_booth']['enabled'] = 0;
}
@ -324,8 +324,8 @@ 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 .= ", accept_conference_suggestions";
$sql .= ", accept_booth_suggestions";
$sql .= ", price_registration";
$sql .= ", price_booth";
$sql .= ", email_msgid";
@ -351,8 +351,8 @@ 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 .= ", ".($this->accept_conference_suggestions ? 1 : 0);
$sql .= ", ".($this->accept_booth_suggestions ? 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');
@ -458,8 +458,8 @@ 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 .= ", accept_conference_suggestions = ".($this->accept_conference_suggestions ? 1 : 0);
$sql .= ", accept_booth_suggestions = ".($this->accept_booth_suggestions ? 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;
@ -552,7 +552,7 @@ 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 .= " allow_unknown_people_conf, allow_unknown_people_booth, price_registration, price_booth";
$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
$sql .= " FROM ".MAIN_DB_PREFIX."projet";
if (!empty($id))
{
@ -609,8 +609,8 @@ 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->accept_conference_suggestions = (int) $obj->accept_conference_suggestions;
$this->accept_booth_suggestions = (int) $obj->accept_booth_suggestions;
$this->price_registration = $obj->price_registration;
$this->price_booth = $obj->price_booth;
$this->email_msgid = $obj->email_msgid;

12
htdocs/projet/event.php
View File

@ -60,8 +60,8 @@ 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->accept_conference_suggestions=(GETPOST('accept_conference_suggestions', 'alpha') == 'on' ? 1 : 0);
$object->accept_booth_suggestions=(GETPOST('accept_booth_suggestions', 'alpha') == 'on' ? 1 : 0);
$object->price_registration=price2num(GETPOST('price_registration', 'alphanohtml'));;
$object->price_booth=price2num(GETPOST('price_booth', 'alphanohtml'));;
@ -250,12 +250,12 @@ if ($id > 0 || !empty($ref))
if ($action == 'edit' && $permissiontoadd) {
//Allow unknown people to suggest conferences
print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestConf") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestConfHelp")) . '</td><td>';
print '<input type="checkbox" name="allow_unknown_people_conf"' . (GETPOSTISSET('allow_unknown_people_conf') ? (GETPOST('allow_unknown_people_conf', 'alpha') != '' ? ' checked="checked"' : '') : ($object->allow_unknown_people_conf ? ' checked="checked"' : '')) . '"> ';
print '<input type="checkbox" name="accept_conference_suggestions"' . (GETPOSTISSET('accept_conference_suggestions') ? (GETPOST('accept_conference_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_conference_suggestions ? ' checked="checked"' : '')) . '"> ';
print "</td></tr>";
//Allow unknown people to suggest booth
print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestBooth") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestBoothHelp")) . '</td><td>';
print '<input type="checkbox" name="allow_unknown_people_booth"' . (GETPOSTISSET('allow_unknown_people_booth') ? (GETPOST('allow_unknown_people_booth', 'alpha') != '' ? ' checked="checked"' : '') : ($object->allow_unknown_people_booth ? ' checked="checked"' : '')) . '"> ';
print '<input type="checkbox" name="accept_booth_suggestions"' . (GETPOSTISSET('accept_booth_suggestions') ? (GETPOST('accept_booth_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_booth_suggestions ? ' checked="checked"' : '')) . '"> ';
print "</td></tr>";
//Price of registration
@ -270,12 +270,12 @@ if ($id > 0 || !empty($ref))
} else {
//Allow unknown people to suggest conferences
print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestConf") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestConfHelp")) . '</td><td>';
print '<input type="checkbox" disabled name="allow_unknown_people_conf"' . (GETPOSTISSET('allow_unknown_people_conf') ? (GETPOST('allow_unknown_people_conf', 'alpha') != '' ? ' checked="checked"' : '') : ($object->allow_unknown_people_conf ? ' checked="checked"' : '')) . '"> ';
print '<input type="checkbox" disabled name="accept_conference_suggestions"' . (GETPOSTISSET('accept_conference_suggestions') ? (GETPOST('accept_conference_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_conference_suggestions ? ' checked="checked"' : '')) . '"> ';
print "</td></tr>";
//Allow unknown people to suggest booth
print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestBooth") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestBoothHelp")) . '</td><td>';
print '<input type="checkbox" disabled name="allow_unknown_people_booth"' . (GETPOSTISSET('allow_unknown_people_booth') ? (GETPOST('allow_unknown_people_booth', 'alpha') != '' ? ' checked="checked"' : '') : ($object->allow_unknown_people_booth ? ' checked="checked"' : '')) . '"> ';
print '<input type="checkbox" disabled name="accept_booth_suggestions"' . (GETPOSTISSET('accept_booth_suggestions') ? (GETPOST('accept_booth_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_booth_suggestions ? ' checked="checked"' : '')) . '"> ';
print "</td></tr>";
//Price of registration

42
htdocs/projet/list.php
View File

@ -96,8 +96,8 @@ $search_usage_opportunity = GETPOST('search_usage_opportunity', 'int');
$search_usage_task = GETPOST('search_usage_task', 'int');
$search_usage_bill_time = GETPOST('search_usage_bill_time', 'int');
$search_usage_event_organization = GETPOST('search_usage_event_organization', 'int');
$search_allow_unknown_people_conf = GETPOST('search_allow_unknown_people_conf', 'int');
$search_allow_unknown_people_booth = GETPOST('search_allow_unknown_people_booth', 'int');
$search_accept_conference_suggestions = GETPOST('search_accept_conference_suggestions', 'int');
$search_accept_booth_suggestions = GETPOST('search_accept_booth_suggestions', 'int');
$search_price_registration = GETPOST("search_price_registration", 'alpha');
$search_price_booth = GETPOST("search_price_booth", 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
@ -216,8 +216,8 @@ if (empty($reshook))
$search_usage_task = '';
$search_usage_bill_time = '';
$search_usage_event_organization = '';
$search_allow_unknown_people_conf = '';
$search_allow_unknown_people_booth = '';
$search_accept_conference_suggestions = '';
$search_accept_booth_suggestions = '';
$search_price_registration = '';
$search_price_booth = '';
$toselect = '';
@ -315,7 +315,7 @@ $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be
$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat";
$sql .= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount ";
$sql .= ", p.usage_opportunity, p.usage_task, p.usage_bill_time, p.usage_organize_event";
$sql .= ", allow_unknown_people_conf, allow_unknown_people_booth, price_registration, price_booth";
$sql .= ", accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
$sql .= ", s.rowid as socid, s.nom as name, s.email";
$sql .= ", cls.code as opp_status_code";
// Add fields from extrafields
@ -385,8 +385,8 @@ if ($search_usage_opportunity != '' && $search_usage_opportunity >= 0) $sql .= n
if ($search_usage_task != '' && $search_usage_task >= 0) $sql .= natural_search('p.usage_task', $search_usage_task, 2);
if ($search_usage_bill_time != '' && $search_usage_bill_time >= 0) $sql .= natural_search('p.usage_bill_time', $search_usage_bill_time, 2);
if ($search_usage_event_organization != '' && $search_usage_event_organization >= 0) $sql .= natural_search('p.usage_organize_event', $search_usage_event_organization, 2);
if ($search_allow_unknown_people_conf != '' && $search_allow_unknown_people_conf >= 0) $sql .= natural_search('p.allow_unknown_people_conf', $search_allow_unknown_people_conf, 2);
if ($search_allow_unknown_people_booth != '' && $search_allow_unknown_people_booth >= 0) $sql .= natural_search('p.allow_unknown_people_booth', $search_allow_unknown_people_booth, 2);
if ($search_accept_conference_suggestions != '' && $search_accept_conference_suggestions >= 0) $sql .= natural_search('p.accept_conference_suggestions', $search_accept_conference_suggestions, 2);
if ($search_accept_booth_suggestions != '' && $search_accept_booth_suggestions >= 0) $sql .= natural_search('p.accept_booth_suggestions', $search_accept_booth_suggestions, 2);
if ($search_price_registration != '') $sql .= natural_search('p.price_registration', $search_price_registration, 1);
if ($search_price_booth != '') $sql .= natural_search('p.price_booth', $search_price_booth, 1);
// Add where from extra fields
@ -466,8 +466,8 @@ if ($search_budget_amount != '') $param .= '&search_budget_amount='.urlencode($s
if ($search_usage_task != '') $param .= '&search_usage_task='.urlencode($search_usage_task);
if ($search_usage_bill_time != '') $param .= '&search_usage_opportunity='.urlencode($search_usage_bill_time);
if ($search_usage_event_organization != '') $param .= '&search_usage_event_organization='.urlencode($search_usage_event_organization);
if ($search_allow_unknown_people_conf != '') $param .= '&search_allow_unknown_people_conf='.urlencode($search_allow_unknown_people_conf);
if ($search_allow_unknown_people_booth != '') $param .= '&search_allow_unknown_people_booth='.urlencode($search_allow_unknown_people_booth);
if ($search_accept_conference_suggestions != '') $param .= '&search_accept_conference_suggestions='.urlencode($search_accept_conference_suggestions);
if ($search_accept_booth_suggestions != '') $param .= '&search_accept_booth_suggestions='.urlencode($search_accept_booth_suggestions);
if ($search_price_registration != '') $param .= '&search_price_registration='.urlencode($search_price_registration);
if ($search_price_booth != '') $param .= '&search_price_booth='.urlencode($search_price_booth);
if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
@ -683,16 +683,16 @@ if (!empty($arrayfields['p.usage_organize_event']['checked']))
print $form->selectyesno('search_usage_event_organization', $search_usage_event_organization, 1, false, 1);
print '</td>';
}
if (!empty($arrayfields['p.allow_unknown_people_conf']['checked']))
if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))
{
print '<td class="liste_titre nowrap right">';
print $form->selectyesno('search_allow_unknown_people_conf', $search_allow_unknown_people_conf, 1, false, 1);
print $form->selectyesno('search_accept_conference_suggestions', $search_accept_conference_suggestions, 1, false, 1);
print '</td>';
}
if (!empty($arrayfields['p.allow_unknown_people_booth']['checked']))
if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))
{
print '<td class="liste_titre nowrap right">';
print $form->selectyesno('search_allow_unknown_people_booth', $search_allow_unknown_people_booth, 1, false, 1);
print $form->selectyesno('search_accept_booth_suggestions', $search_accept_booth_suggestions, 1, false, 1);
print '</td>';
}
if (!empty($arrayfields['p.price_registration']['checked']))
@ -761,8 +761,8 @@ if (!empty($arrayfields['p.usage_opportunity']['checked'])) print_liste_field_ti
if (!empty($arrayfields['p.usage_task']['checked'])) print_liste_field_titre($arrayfields['p.usage_task']['label'], $_SERVER["PHP_SELF"], 'p.usage_task', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.usage_bill_time']['checked'])) print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.usage_organize_event']['checked'])) print_liste_field_titre($arrayfields['p.usage_organize_event']['label'], $_SERVER["PHP_SELF"], 'p.usage_organize_event', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.allow_unknown_people_conf']['checked'])) print_liste_field_titre($arrayfields['p.allow_unknown_people_conf']['label'], $_SERVER["PHP_SELF"], 'p.allow_unknown_people_conf', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.allow_unknown_people_booth']['checked'])) print_liste_field_titre($arrayfields['p.allow_unknown_people_booth']['label'], $_SERVER["PHP_SELF"], 'p.allow_unknown_people_booth', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.accept_conference_suggestions']['checked'])) print_liste_field_titre($arrayfields['p.accept_conference_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_conference_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.accept_booth_suggestions']['checked'])) print_liste_field_titre($arrayfields['p.accept_booth_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_booth_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.price_registration']['checked'])) print_liste_field_titre($arrayfields['p.price_registration']['label'], $_SERVER["PHP_SELF"], 'p.price_registration', "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['p.price_booth']['checked'])) print_liste_field_titre($arrayfields['p.price_booth']['label'], $_SERVER["PHP_SELF"], 'p.price_booth', "", $param, '', $sortfield, $sortorder, 'right ');
// Extra fields
@ -1001,23 +1001,23 @@ while ($i < min($num, $limit))
if (!$i) $totalarray['nbfield']++;
}
// Allow unknown people to suggest conferences
if (!empty($arrayfields['p.allow_unknown_people_conf']['checked']))
if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))
{
print '<td class="right">';
if ($obj->allow_unknown_people_conf)
if ($obj->accept_conference_suggestions)
{
print yn($obj->allow_unknown_people_conf);
print yn($obj->accept_conference_suggestions);
}
print '</td>';
if (!$i) $totalarray['nbfield']++;
}
// Allow unknown people to suggest booth
if (!empty($arrayfields['p.allow_unknown_people_booth']['checked']))
if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))
{
print '<td class="right">';
if ($obj->allow_unknown_people_booth)
if ($obj->accept_booth_suggestions)
{
print yn($obj->allow_unknown_people_booth);
print yn($obj->accept_booth_suggestions);
}
print '</td>';
if (!$i) $totalarray['nbfield']++;