';
}
if ($line->date_start_fill) {
print '
'.$langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
@@ -180,7 +180,7 @@ if (($line->info_bits & 2) == 2) {
}
} else {
if ($line->date_start || $line->date_end) {
- print '
'.get_date_range($line->date_start, $line->date_end, $format).'
';
+ print '
'.get_date_range($line->date_start, $line->date_end, $format).'
';
}
//print get_date_range($line->date_start, $line->date_end, $format);
}
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 2ec083b0fa8..535c4383d0d 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -160,7 +160,7 @@ print dol_get_fiche_end();
print '
';
print $langs->trans('SendAgreementText');
-print '
'.$langs->trans('SendAgreement').' ';
+print '
'.$langs->trans('SendAgreement').' ';
llxFooter();
$db->close();
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 7d4a3b181e0..c72718ffce2 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -330,7 +330,7 @@ if ($action == 'create') { // Create. Seems to no be used
$morehtmlref .= '
'.$langs->trans('Project').' ';
if (0) { // Do not change on shipment
if ($action != 'classify') {
- $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $expedition->id, $expedition->socid, $expedition->fk_project, 'projectid', 0, 0, 1, 1);
@@ -651,9 +651,9 @@ if ($action == 'create') { // Create. Seems to no be used
if ($user->rights->expedition->delivery->supprimer) {
if ($conf->expedition_bon->enabled) {
- print '
'.$langs->trans("Delete").' ';
+ print '
'.$langs->trans("Delete").' ';
} else {
- print '
'.$langs->trans("Delete").' ';
+ print '
'.$langs->trans("Delete").' ';
}
}
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index d8b06285be4..c56effea73a 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -251,12 +251,12 @@ if (is_resource($handle)) {
print '';
} else {
print "
\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').' ';
print ' ';
}
} else {
print "
\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -267,7 +267,7 @@ if (is_resource($handle)) {
print '';
} else {
print "
";
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
print ' ';
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 2aa4b971e0f..528a640b391 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -700,7 +700,7 @@ if (!empty($id) && $action != 'edit') {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -876,7 +876,7 @@ if (!empty($id) && $action != 'edit') {
// Classify 'paid'
if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer) {
- print '
";
+ print '
";
}
// Delete
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 374306bc7b0..52e33a26cb4 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -132,7 +132,7 @@ if ($object->id) {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- // $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ // $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 8d8f4065dda..431783e873a 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -82,7 +82,7 @@ if (!empty($conf->projet->enabled)) {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- // $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ // $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 13f9b1d4a96..9dca36bd1a0 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- // $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ // $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 40cf0298895..363ef6d34ef 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -213,7 +213,7 @@ print '
';
if (empty($action)) {
if ($user->rights->don->supprimer) {
if (!$disable_delete) {
- print '
'.$langs->trans('Delete').' ';
+ print '
'.$langs->trans('Delete').' ';
} else {
print '
'.$langs->trans('Delete').' ';
}
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 3c7af135922..54b1e6b6bb8 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -144,7 +144,6 @@ class EcmDirectory extends CommonObject
// Clean parameters
$this->label = dol_sanitizeFileName(trim($this->label));
- $this->fk_parent = trim($this->fk_parent);
$this->description = trim($this->description);
$this->date_c = $now;
$this->fk_user_c = $user->id;
@@ -155,7 +154,7 @@ class EcmDirectory extends CommonObject
// Check if same directory does not exists with this name
$relativepath = $this->label;
- if ($this->fk_parent) {
+ if ($this->fk_parent > 0) {
$parent = new EcmDirectory($this->db);
$parent->fetch($this->fk_parent);
$relativepath = $parent->getRelativePath().$relativepath;
@@ -194,11 +193,11 @@ class EcmDirectory extends CommonObject
$sql .= ") VALUES (";
$sql .= " '".$this->db->escape($this->label)."',";
$sql .= " '".$this->db->escape($conf->entity)."',";
- $sql .= " '".$this->db->escape($this->fk_parent)."',";
+ $sql .= " ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "null").",";
$sql .= " '".$this->db->escape($this->description)."',";
$sql .= " ".((int) $this->cachenbofdoc).",";
$sql .= " '".$this->db->idate($this->date_c)."',";
- $sql .= " '".$this->db->escape($this->fk_user_c)."'";
+ $sql .= " ".($this->fk_user_c > 0 ? ((int) $this->fk_user_c) : "null").",";
$sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -249,20 +248,19 @@ class EcmDirectory extends CommonObject
// Clean parameters
$this->label = trim($this->label);
- $this->fk_parent = trim($this->fk_parent);
$this->description = trim($this->description);
-
- // Check parameters
- // Put here code to add control on parameters values
+ if ($this->fk_parent <= 0) {
+ $this->fk_parent = 0;
+ }
$this->db->begin();
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
- $sql .= " label='".$this->db->escape($this->label)."',";
- $sql .= " fk_parent='".$this->db->escape($this->fk_parent)."',";
- $sql .= " description='".$this->db->escape($this->description)."'";
- $sql .= " WHERE rowid=".((int) $this->id);
+ $sql .= " label = '".$this->db->escape($this->label)."',";
+ $sql .= " fk_parent = ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "null").",";
+ $sql .= " description = '".$this->db->escape($this->description)."'";
+ $sql .= " WHERE rowid = ".((int) $this->id);
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 74d7cc309b9..737d2134ccc 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -515,7 +515,7 @@ class EmailCollector extends CommonObject
$label .= '
';
$label .= '
'.$langs->trans('Ref').': '.$this->ref;
- $url = dol_buildpath('/admin/emailcollector_card.php', 1).'?id='.$this->id;
+ $url = DOL_URL_ROOT.'/admin/emailcollector_card.php?id='.$this->id;
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 1987a5300bd..328f3504497 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -106,8 +106,8 @@ class ConferenceOrBooth extends ActionComm
'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"Help text", 'showoncombobox'=>'1',),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty", 'picto'=>'company', 'css'=>'maxwidth500'),
- 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project'),
+ 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
+ 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1),
'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width300'),
'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index f4a4933a899..1e76e3544e5 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -103,14 +103,15 @@ class ConferenceOrBoothAttendee extends CommonObject
public $fields=array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>2, 'index'=>1, 'comment'=>"Reference of object"),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status = 1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'Attendee', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty", 'picto'=>'company', 'css'=>'maxwidth500'),
- 'fk_actioncomm' => array('type'=>'integer:ActionComm:comm/action/class/actioncomm.class.php:1', 'label'=>'ConferenceOrBooth', 'enabled'=>'1', 'position'=>53, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'picto'=>'agenda'),
- 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'picto'=>'project'),
- 'email' => array('type'=>'mail', 'label'=>'Email', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
+ 'fk_actioncomm' => array('type'=>'integer:ActionComm:comm/action/class/actioncomm.class.php:1', 'label'=>'ConferenceOrBooth', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'picto'=>'agenda'),
+ 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
+ 'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
+ 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status = 1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
'date_subscription' => array('type'=>'datetime', 'label'=>'DateOfRegistration', 'enabled'=>'1', 'position'=>56, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'1',),
+ 'fk_invoice' => array('type'=>'integer:Facture:compta/facture/class/facture.class.php', 'label'=>'Invoice', 'enabled'=>'1', 'position'=>57, 'notnull'=>0, 'visible'=>-1, 'index'=>0, 'picto'=>'bill', 'css'=>'tdoverflowmax150 maxwidth500'),
'amount' => array('type'=>'price', 'label'=>'AmountPaid', 'enabled'=>'1', 'position'=>57, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"AmountOfSubscriptionPaid",),
- 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
- 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+ 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>3,),
+ 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>3,),
'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>-1, 'visible'=>-2),
@@ -126,6 +127,7 @@ class ConferenceOrBoothAttendee extends CommonObject
public $fk_actioncomm;
public $email;
public $date_subscription;
+ public $fk_invoice;
public $amount;
public $note_public;
public $note_private;
@@ -634,6 +636,31 @@ class ConferenceOrBoothAttendee extends CommonObject
}
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Load the project with id $this->fk_project into this->project
+ *
+ * @return int <0 if KO, >=0 if OK
+ */
+ public function fetch_projet()
+ {
+ // phpcs:enable
+ include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+ if (empty($this->fk_project) && !empty($this->fk_projet)) {
+ $this->fk_project = $this->fk_projet; // For backward compatibility
+ }
+ if (empty($this->fk_project)) {
+ return 0;
+ }
+
+ $project = new Project($this->db);
+ $result = $project->fetch($this->fk_project);
+
+ $this->projet = $project; // deprecated
+ $this->project = $project;
+ return $result;
+ }
/**
* Set draft status
@@ -736,7 +763,7 @@ class ConferenceOrBoothAttendee extends CommonObject
$label .= '
'.$langs->trans('DateOfRegistration').': '.dol_print_date($this->date_subscription, 'dayhour');
$label .= '
'.$langs->trans('AmountPaid').': '.$this->amount;
- $url = dol_buildpath('/eventorganization/conferenceorboothattendee_card.php', 1).'?id='.$this->id;
+ $url = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?id='.$this->id;
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
@@ -836,6 +863,17 @@ class ConferenceOrBoothAttendee extends CommonObject
return $result;
}
+ /**
+ * Return the label of the status
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function getLabelStatus($mode = 0)
+ {
+ return $this->LibStatut($this->status, $mode);
+ }
+
/**
* Return the label of the status
*
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index ec3e00c0dde..fafbd0a6f8b 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -152,8 +152,6 @@ if (empty($reshook)) {
/*
* View
- *
- * Put here all code to build page
*/
$form = new Form($db);
@@ -558,16 +556,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (empty($reshook)) {
// Send
if (empty($user->socid)) {
- print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=presend&mode=init#formmailbeforetitle');
+ print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
}
- print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=edit', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=edit&token='.newToken().'', '', $permissiontoadd);
// Clone
- print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=scrumsprint', '', $permissiontoadd);
// Delete (need delete permission, or if draft, just need create/modify permission)
- print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&action=delete&token='.newToken().'', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
}
print '
'."\n";
}
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 9fc26503c44..3b135c21dc4 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -358,7 +358,7 @@ if ($object->id) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 891fdc1da6e..7defb3dbf3c 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -55,6 +55,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
$id = GETPOST('id', 'int');
$projectid = GETPOST('projectid', 'int');
+$projectref = GETPOST('ref');
// Load variable for pagination
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -152,12 +153,12 @@ if (!$permissiontoread) accessforbidden();
* Actions
*/
-if (preg_match('/^set/', $action) && $projectid > 0 && !empty($user->rights->eventorganization->write)) {
+if (preg_match('/^set/', $action) && ($projectid > 0 || $projectref) && !empty($user->rights->eventorganization->write)) {
$project = new Project($db);
//If "set" fields keys is in projects fields
$project_attr=preg_replace('/^set/', '', $action);
if (array_key_exists($project_attr, $project->fields)) {
- $result = $project->fetch($projectid);
+ $result = $project->fetch($projectid, $projectref);
if ($result < 0) {
setEventMessages(null, $project->errors, 'errors');
} else {
@@ -234,11 +235,13 @@ $now = dol_now();
$help_url = '';
$title = $langs->trans('ListOfConferencesOrBooths');
-if ($projectid > 0) {
+if ($projectid > 0 || $projectref) {
$project = new Project($db);
- $result = $project->fetch($projectid);
+ $result = $project->fetch($projectid, $projectref);
if ($result < 0) {
setEventMessages(null, $project->errors, 'errors');
+ } else {
+ $projectid = $project->id;
}
$result = $project->fetch_thirdparty();
if ($result < 0) {
@@ -430,8 +433,8 @@ if ($projectid > 0) {
print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage"));
//print '';
print '
';
- $linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.$project->id;
- $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 'md5');
+ $linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $project->id);
+ $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.((int) $project->id), 'md5');
$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
//print '';
//print '
';
- $link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.$project->id.'&type=global';
- $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 'md5');
+ $link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.((int) $project->id).'&type=global';
+ $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.((int) $project->id), 'md5');
$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
//print '';
//print '
';
@@ -582,7 +585,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
- header("Location: ".dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?id='.$id);
+ header("Location: ".DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?id='.((int) $id));
exit;
}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index f10c0b694cb..1b4b5f62828 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -48,7 +48,7 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
$conf_or_booth_id = GETPOST('conforboothid', 'int');
$fk_project = GETPOST('fk_project', 'int');
-$withproject = GETPOST('withproject', 'int');
+$withproject = 1;
// Initialize technical objects
$object = new ConferenceOrBoothAttendee($db);
@@ -65,6 +65,7 @@ if ($conf_or_booth_id > 0) {
} else {
$object->fk_actioncomm = $confOrBooth->id;
$object->fk_project = $confOrBooth->fk_project;
+ $fk_project = $object->fk_project;
}
}
@@ -74,12 +75,24 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias
-$search_all = GETPOST("search_all", 'alpha');
+$search_all = GETPOST('search_all', 'alphanohtml');
$search = array();
foreach ($object->fields as $key => $val) {
- if (GETPOST('search_'.$key, 'alpha')) {
+ if (GETPOST('search_'.$key, 'alpha') !== '') {
$search[$key] = GETPOST('search_'.$key, 'alpha');
}
+ if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+ $search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+ $search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+ }
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+ if (!empty($val['searchall'])) {
+ $fieldstosearchall['t.'.$key] = $val['label'];
+ }
}
if (empty($action) && empty($id) && empty($ref)) {
@@ -174,8 +187,6 @@ if (empty($reshook)) {
/*
* View
- *
- * Put here all code to build page
*/
$form = new Form($db);
@@ -305,7 +316,7 @@ if (!empty($withproject)) {
print '
';
print '
';
- print '
';
+ print '';
// Description
print ''.$langs->trans("Description").' ';
@@ -319,7 +330,7 @@ if (!empty($withproject)) {
print " ";
}
- print '';
+ print ' ';
$typeofdata = 'checkbox:'.($projectstatic->accept_conference_suggestions ? ' checked="checked"' : '');
$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
@@ -336,15 +347,15 @@ if (!empty($withproject)) {
print " ';
- print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+ print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
print ' ';
- print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+ print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
print " ';
- print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+ print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
print ' ';
- print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+ print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
print " '.$langs->trans("EventOrganizationICSLink").' ';
@@ -353,7 +364,7 @@ if (!empty($withproject)) {
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
// Show message
- $message = 'entity > 1 ? "&entity=".$conf->entity : "");
$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').' ';
print $message;
@@ -366,7 +377,7 @@ if (!empty($withproject)) {
//print '';
print ' ';
$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.$projectstatic->id;
- $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 2);
+ $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
//print '';
//print '
';
$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.$projectstatic->id.'&type=global';
- $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 2);
+ $encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
//print '';
//print '
';
@@ -559,6 +570,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '
';
print '
'."\n";
+ $keyforbreak = 'note_public';
+
// Common attributes
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
@@ -643,11 +656,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=edit', '', $permissiontoadd);
// Clone
- print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+ print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=scrumsprint', '', $permissiontoadd);
// Delete (need delete permission, or if draft, just need create/modify permission)
- print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
}
print ''."\n";
}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 6910973b8d3..19d35a4be0e 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -97,7 +97,7 @@ if (!$sortorder) {
}
// Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
$search = array();
foreach ($object->fields as $key => $val) {
if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -369,8 +369,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
}
-// Output page
-// --------------------------------------------------------------------
llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
@@ -646,22 +644,25 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
foreach ($search as $key => $val) {
if (is_array($search[$key]) && count($search[$key])) {
foreach ($search[$key] as $skey) {
- $param .= '&search_'.$key.'[]='.urlencode($skey);
+ if ($skey != '') {
+ $param .= '&search_'.$key.'[]='.urlencode($skey);
+ }
}
- } else {
+ } elseif ($search[$key] != '') {
$param .= '&search_'.$key.'='.urlencode($search[$key]);
}
}
if ($confOrBooth->id > 0) {
- $param .= '&conforboothid='.urlencode($confOrBooth->id).$withProjectUrl;
+ $param .= '&conforboothid='.urlencode($confOrBooth->id);
}
if ($projectstatic->id > 0) {
- $param .= '&fk_project='.urlencode($projectstatic->id).$withProjectUrl;
+ $param .= '&fk_project='.urlencode($projectstatic->id);
}
-
+$param .= $withProjectUrl;
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
+
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// Add $param from hooks
@@ -694,6 +695,8 @@ print '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
index f2bb6f0c3ae..732d3254203 100644
--- a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
@@ -54,7 +54,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
}
print '';
echo ''.$objectlink->getLibStatut(3).' ';
- echo ''.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' '.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' '.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -2363,10 +2363,10 @@ if ($action == 'create') {
} elseif ($object->statut == Expedition::STATUS_DRAFT) {
// edit-delete buttons
print '';
- print 'id.'">'.img_edit().' ';
+ print 'id.'">'.img_edit().' ';
print ' ';
print '';
- print 'id.'">'.img_delete().' ';
+ print 'id.'">'.img_delete().' ';
print ' ';
// Display lines extrafields
@@ -2442,9 +2442,9 @@ if ($action == 'create') {
// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer) {
if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) { // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
- print ''.$langs->trans("ClassifyUnbilled").' ';
+ print ''.$langs->trans("ClassifyUnbilled").' ';
} else {
- print ''.$langs->trans("ReOpen").' ';
+ print ''.$langs->trans("ReOpen").' ';
}
}
@@ -2489,13 +2489,13 @@ if ($action == 'create') {
// Cancel
if ($object->statut == Expedition::STATUS_VALIDATED) {
if ($user->rights->expedition->supprimer) {
- print ''.$langs->trans("Cancel").' ';
+ print ''.$langs->trans("Cancel").' ';
}
}
// Delete
if ($user->rights->expedition->supprimer) {
- print ''.$langs->trans("Delete").' ';
+ print ''.$langs->trans("Delete").' ';
}
}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index aea23298fcf..ac0c068bfc9 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -154,7 +154,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 43299dad066..ee0014a2f8d 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -126,7 +126,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 9deb80c003a..391628a9d38 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -409,16 +409,16 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit);
}
if ($sall) {
- $param .= "&sall=".urlencode($sall);
+ $param .= "&sall=".urlencode($sall);
}
if ($search_ref_exp) {
- $param .= "&search_ref_exp=".urlencode($search_ref_exp);
+ $param .= "&search_ref_exp=".urlencode($search_ref_exp);
}
if ($search_ref_liv) {
- $param .= "&search_ref_liv=".urlencode($search_ref_liv);
+ $param .= "&search_ref_liv=".urlencode($search_ref_liv);
}
if ($search_ref_customer) {
- $param .= "&search_ref_customer=".urlencode($search_ref_customer);
+ $param .= "&search_ref_customer=".urlencode($search_ref_customer);
}
if ($search_user > 0) {
$param .= '&search_user='.urlencode($search_user);
@@ -427,13 +427,13 @@ if ($search_sale > 0) {
$param .= '&search_sale='.urlencode($search_sale);
}
if ($search_company) {
- $param .= "&search_company=".urlencode($search_company);
+ $param .= "&search_company=".urlencode($search_company);
}
if ($search_shipping_method_id) {
$param .= "&search_shipping_method_id=".urlencode($search_shipping_method_id);
}
if ($search_tracking) {
- $param .= "&search_tracking=".urlencode($search_tracking);
+ $param .= "&search_tracking=".urlencode($search_tracking);
}
if ($search_town) {
$param .= '&search_town='.urlencode($search_town);
@@ -789,7 +789,7 @@ while ($i < min($num, $limit)) {
// Ref
if (!empty($arrayfields['e.ref']['checked'])) {
- print "";
+ print ' ';
print $shipment->getNomUrl(1);
print " \n";
if (!$i) {
@@ -809,7 +809,7 @@ while ($i < min($num, $limit)) {
// Third party
if (!empty($arrayfields['s.nom']['checked'])) {
- print '';
+ print ' ';
print $companystatic->getNomUrl(1);
print ' ';
if (!$i) {
@@ -827,7 +827,7 @@ while ($i < min($num, $limit)) {
}
// Zip
if (!empty($arrayfields['s.zip']['checked'])) {
- print '';
+ print ' ';
print $obj->zip;
print ' ';
if (!$i) {
@@ -836,7 +836,7 @@ while ($i < min($num, $limit)) {
}
// State
if (!empty($arrayfields['state.nom']['checked'])) {
- print "".$obj->state_name." \n";
+ print ''.$obj->state_name." \n";
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 5ebc54193da..f7217ed2e0a 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index e9f79e2ef12..f543b8baee4 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -293,7 +293,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 191eb6a0458..9941139ea19 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1646,7 +1646,7 @@ if ($action == 'create') {
if ($user->rights->commande->creer)
{
if ($action != 'classify')
- $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
$morehtmlref.='';
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index ff5198c006a..d03cbca69c5 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -455,20 +455,21 @@ dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtm
print '';
-print '
';
+print '
';
+print '
';
print '
';
// Type
$type = ($object->format == "A") ? 'classic' : 'date';
-print ''.$langs->trans("Type").' ';
+print ' '.$langs->trans("Type").' ';
print img_picto('', dol_buildpath('/opensurvey/img/'.($type == 'classic' ? 'chart-32.png' : 'calendar-32.png'), 1), 'width="16"', 1);
print ' '.$langs->trans($type == 'classic' ? "TypeClassic" : "TypeDate").' ';
$adresseadmin = $object->mail_admin;
-print $langs->trans("Title").' ';
+print $langs->trans("Title").' ';
if ($action == 'edit') {
print ' '.$langs->trans("Description").' ';
+if ($action == 'edit') {
+ $doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
+ $doleditor->Create(0, '');
+} else {
+ print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
+}
+print ' '.$langs->trans("EMail").' ';
+ if ($action == 'edit') {
+ print '
';
+
+print '
';
+print '
';
+print '
';
+
+print '
';
+
+
// Expire date
-print ''.$langs->trans('ExpireDate').' ';
+print ' '.$langs->trans('ExpireDate').' ';
if ($action == 'edit') {
print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
} else {
@@ -490,7 +522,7 @@ print ' ';
-print $langs->trans("Author").' ';
+print $langs->trans("Author").' ';
if ($object->fk_user_creat) {
print $userstatic->getLoginUrl(1);
} else {
@@ -499,7 +531,7 @@ if ($object->fk_user_creat) {
print ' '.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').' ';
+print ' '.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').' ';
// Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -521,8 +553,10 @@ if ($action != 'edit') {
print '
';
+print '
';
print '
';
print dol_get_fiche_end();
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 6458c9ab71c..f40b771b34d 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -121,6 +121,7 @@ class Partnership extends CommonObject
'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),
'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
+ // fk_member and fk_soc are added into constructor
);
/**
@@ -197,9 +198,9 @@ class Partnership extends CommonObject
$this->db = $db;
if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
- $this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member');
+ $this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member', 'csslist'=>'tdoverflowmax150');
} else {
- $this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company');
+ $this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company', 'csslist'=>'tdoverflowmax150');
}
if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
@@ -951,7 +952,7 @@ class Partnership extends CommonObject
$label .= ''.$langs->trans('Ref').': '.$this->ref;
- $url = dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$this->id;
+ $url = DOL_URL_ROOT.'/partnership/partnership_card.php?id='.$this->id;
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 799aadd24cd..f154e1b9f5b 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -154,7 +154,7 @@ if ($object->id > 0) {
$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
$morehtmlref.=' : ';
if ($action == 'classify') {
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index bf980ab9cda..db637136cad 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -412,7 +412,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$langs->load("projects");
$morehtmlref .= '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
+ //if ($action != 'classify') $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
$morehtmlref .= ' : ';
if ($action == 'classify') {
//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -643,14 +643,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$MAXEVENT = 10;
- $morehtmlright = '';
+ $morehtmlright = ' ';
$morehtmlright .= $langs->trans("SeeAll");
$morehtmlright .= ' ';
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+ $somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
print '';
}
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 1c416cf690c..a4a61c6e907 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -140,7 +140,7 @@ if ($object->id) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index e7fae7ee7ff..79b7be0057a 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -137,7 +137,7 @@ if ($object->id) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index cc97eac5515..67f963b155e 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 2b86efa507c..a0849f082e8 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -274,13 +274,13 @@ if ($mode == 'config' && $user->admin) {
print ajax_constantonoff($printer->active);
} else {
if (empty($conf->global->{$printer->conf})) {
- print ''.img_picto($langs->trans("Disabled"), 'off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'off').' ';
} else {
- print ''.img_picto($langs->trans("Enabled"), 'on').' ';
+ print ''.img_picto($langs->trans("Enabled"), 'on').' ';
}
}
- print ''.img_picto('', 'setup').' '.img_picto('', 'setup').' '.img_picto('', 'setup').' '.img_picto('', 'setup').' ';
if (!$disabled) {
- print '';
+ print ' ';
}
print img_picto($langs->trans("Disabled"), 'switch_off');
if (!$disabled) {
@@ -448,13 +448,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print ' '."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -463,7 +463,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->PRODUCT_ADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
@@ -762,10 +762,10 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
if ($conf->global->$const) {
print img_picto($langs->trans("Active"), 'tick');
print '';
- print ''.$langs->trans("Disable").' ';
+ print ''.$langs->trans("Disable").' ';
} else {
print ' ';
- print ''.$langs->trans("Activate").' ';
+ print ''.$langs->trans("Activate").' ';
}
print ' ';
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 3f4fd636de4..24f515fa0bc 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -161,7 +161,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
if ($conf->global->PRODUCTBATCH_LOT_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
@@ -253,7 +253,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
if ($conf->global->PRODUCTBATCH_SN_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 23fc0077c97..b6820bddddd 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -481,7 +481,7 @@ if (empty($reshook)) {
$object->setCategories($categories);
if (!empty($backtopage)) {
- $backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+ $backtopage = preg_replace('/__ID__/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
if (preg_match('/\?/', $backtopage)) {
$backtopage .= '&socid='.$object->id; // Old method
}
@@ -2525,7 +2525,7 @@ if ($action != 'create' && $action != 'edit') {
if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
print ''.$langs->trans('Delete').' '."\n";
} else {
- print 'id.'">'.$langs->trans("Delete").' ';
+ print 'id.'">'.$langs->trans("Delete").' ';
}
} else {
print ''.$langs->trans("Delete").' ';
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 418a71166a8..784be41dfe9 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -190,7 +190,7 @@ print ''.$langs->trans("Back").' ';
if ($eid == 0) {
print ''.$langs->trans('Delete').'
'."\n";
} else {
- print '';
+ print '';
}
print '';
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 539456351cb..ee39486fb5b 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -315,7 +315,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
{
if ($action != 'classify')
{
- $morehtmlref .= '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
if ($action == 'classify') {
//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
$morehtmlref .= '