';
print '';
print '';
print '| ';
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 1cbaf4cbe14..79cc42c2874 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -20,10 +20,12 @@ use Luracast\Restler\RestException;
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+
require_once DOL_DOCUMENT_ROOT.'/adherents/class/api_members.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/api_products.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/api_contacts.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/api_thirdparties.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/api_projects.class.php';
/**
* API class for categories
@@ -48,7 +50,7 @@ class Categories extends DolibarrApi
3 => 'member',
4 => 'contact',
5 => 'account',
- //6 => 'project',
+ 6 => 'project',
//7 => 'user',
//8 => 'bank_line',
//9 => 'warehouse',
@@ -179,7 +181,8 @@ class Categories extends DolibarrApi
}
$i++;
}
- } else {
+ }
+ else {
throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -239,10 +242,9 @@ class Categories extends DolibarrApi
$this->category->$field = $value;
}
- if ($this->category->update(DolibarrApiAccess::$user) > 0)
- {
+ if ($this->category->update(DolibarrApiAccess::$user) > 0) {
return $this->get($id);
- } else {
+ } else {
throw new RestException(500, $this->category->error);
}
}
@@ -285,7 +287,7 @@ class Categories extends DolibarrApi
* Get the list of categories linked to an object
*
* @param int $id Object ID
- * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+ * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact', 'project')
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
@@ -303,7 +305,8 @@ class Categories extends DolibarrApi
Categorie::TYPE_CONTACT,
Categorie::TYPE_CUSTOMER,
Categorie::TYPE_SUPPLIER,
- Categorie::TYPE_MEMBER
+ Categorie::TYPE_MEMBER,
+ Categorie::TYPE_PROJECT
])) {
throw new RestException(401);
}
@@ -318,6 +321,8 @@ class Categories extends DolibarrApi
throw new RestException(401);
} elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) {
throw new RestException(401);
+ } elseif ($type == Categorie::TYPE_PROJECT && !DolibarrApiAccess::$user->rights->projet->lire) {
+ throw new RestException(401);
}
$categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
@@ -326,7 +331,7 @@ class Categories extends DolibarrApi
if ($categories == 0) {
throw new RestException(404, 'No category found for this object');
}
- throw new RestException(500, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors));
+ throw new RestException(600, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors));
}
return $categories;
}
@@ -727,7 +732,7 @@ class Categories extends DolibarrApi
* Get the list of objects in a category.
*
* @param int $id ID of category
- * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+ * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact', 'project')
* @param int $onlyids Return only ids of objects (consume less memory)
*
* @return mixed
@@ -772,9 +777,10 @@ class Categories extends DolibarrApi
$objects_api = new Products();
} elseif ($type == 'contact') {
$objects_api = new Contacts();
+ } elseif ($type == 'project') {
+ $objects_api = new Projects();
}
- if (is_object($objects_api))
- {
+ if (is_object($objects_api)) {
foreach ($objects as $obj) {
$cleaned_objects[] = $objects_api->_cleanObjectDatas($obj);
}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 72ffd2b6bba..6d9bb13e2c1 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -248,7 +248,7 @@ if (empty($reshook) && $action == 'add')
if (!$error)
{
// Initialisation objet actioncomm
- $object->priority = GETPOST("priority") ?GETPOST("priority") : 0;
+ $object->priority = GETPOST("priority") ? GETPOST("priority") : 0;
$object->fulldayevent = (!empty($fulldayevent) ? 1 : 0);
$object->location = GETPOST("location");
$object->label = trim(GETPOST('label'));
@@ -1706,6 +1706,7 @@ if ($id > 0)
}
print ' | ';
}
+
// Categories
if ($conf->categorie->enabled) {
print '| '.$langs->trans("Categories").' | ';
@@ -1781,7 +1782,7 @@ if ($id > 0)
}
// Description
- print ' | | '.$langs->trans("Description").' | ';
+ print ' | | '.$langs->trans("Description").' | ';
print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
print ' | ';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 4fb80592adf..2d371f80be5 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -492,7 +492,7 @@ class ActionComm extends CommonObject
$sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null").", ";
$sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null").", ";
$sql .= " '".$this->db->escape($this->note_private)."', ";
- $sql .= ((isset($this->contact_id) && $this->contact_id > 0) ? $this->contact_id : "null").", ";
+ $sql .= ((isset($this->contact_id) && $this->contact_id > 0) ? $this->contact_id : "null").", "; // deprecated, use ->socpeopleassigned
$sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
$sql .= ($userownerid > 0 ? $userownerid : "null").", ";
$sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
@@ -666,12 +666,13 @@ class ActionComm extends CommonObject
/**
* Load object from database
*
- * @param int $id Id of action to get
- * @param string $ref Ref of action to get
- * @param string $ref_ext Ref ext to get
- * @return int <0 if KO, >0 if OK
+ * @param int $id Id of action to get
+ * @param string $ref Ref of action to get
+ * @param string $ref_ext Ref ext to get
+ * @param string $email_msgid Email msgid
+ * @return int <0 if KO, >0 if OK
*/
- public function fetch($id, $ref = '', $ref_ext = '')
+ public function fetch($id, $ref = '', $ref_ext = '', $email_msgid = '')
{
global $langs;
@@ -692,6 +693,7 @@ class ActionComm extends CommonObject
$sql .= " a.fk_contact, a.percent as percentage,";
$sql .= " a.fk_element as elementid, a.elementtype,";
$sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
+ $sql .= " a.email_msgid, a.email_subject, a.email_from, a.email_to, a.email_tocc, a.email_tobcc, a.errors_to,";
$sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
$sql .= " s.nom as socname,";
$sql .= " u.firstname, u.lastname as lastname";
@@ -700,9 +702,10 @@ class ActionComm extends CommonObject
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
$sql .= " WHERE ";
- if ($ref) $sql .= " a.id=".$ref; // No field ref, we use id
- elseif ($ref_ext) $sql .= " a.ref_ext='".$this->db->escape($ref_ext)."'";
- else $sql .= " a.id=".$id;
+ if ($ref) $sql .= " a.id = ".((int) $ref); // No field ref, we use id
+ elseif ($ref_ext) $sql .= " a.ref_ext = '".$this->db->escape($ref_ext)."'";
+ elseif ($email_msgid) $sql .= " a.email_msgid = '".$this->db->escape($email_msgid)."'";
+ else $sql .= " a.id = ".((int) $id);
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -1141,8 +1144,17 @@ class ActionComm extends CommonObject
if (!empty($socid)) $sql .= " AND a.fk_soc = ".$socid;
if (!empty($elementtype))
{
- if ($elementtype == 'project') $sql .= ' AND a.fk_project = '.$fk_element;
- else $sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$elementtype."'";
+ if ($elementtype == 'project') {
+ $sql .= ' AND a.fk_project = '.$fk_element;
+ }
+ elseif ($elementtype == 'contact') {
+ $sql .= ' AND a.id IN';
+ $sql .= " (SELECT fk_actioncomm FROM ".MAIN_DB_PREFIX."actioncomm_resources WHERE";
+ $sql .= " element_type = 'socpeople' AND fk_element = ".$fk_element.')';
+ }
+ else {
+ $sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$elementtype."'";
+ }
}
if (!empty($filter)) $sql .= $filter;
if ($sortorder && $sortfield) $sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 97d732f6908..39a37074b1d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1072,6 +1072,28 @@ if (count($listofextcals))
elseif ($icalevent['DESCRIPTION']) $event->label = dol_nl2br($icalevent['DESCRIPTION'], 1);
else $event->label = $langs->trans("ExtSiteNoLabel");
+ // Priority (see https://www.kanzaki.com/docs/ical/priority.html)
+ // LOW = 0 to 4
+ // MEDIUM = 5
+ // HIGH = 6 to 9
+ if ($icalevent['PRIORITY']) $event->priority = $icalevent['PRIORITY'];
+
+ // Transparency (see https://www.kanzaki.com/docs/ical/transp.html)
+ if ($icalevent['TRANSP'])
+ {
+ if ($icalevent['TRANSP'] == "TRANSPARENT") $event->transparency = 0; // 0 = available / free
+ if ($icalevent['TRANSP'] == "OPAQUE") $event->transparency = 1; // 1 = busy
+
+ // TODO: MS outlook states
+ // X-MICROSOFT-CDO-BUSYSTATUS:FREE + TRANSP:TRANSPARENT => Available / Free
+ // X-MICROSOFT-CDO-BUSYSTATUS:FREE + TRANSP:OPAQUE => Work another place
+ // X-MICROSOFT-CDO-BUSYSTATUS:TENTATIVE + TRANSP:OPAQUE => With reservations
+ // X-MICROSOFT-CDO-BUSYSTATUS:BUSY + TRANSP:OPAQUE => Busy
+ // X-MICROSOFT-CDO-BUSYSTATUS:OOF + TRANSP:OPAQUE => Away from the office / off-site
+ }
+
+ if ($icalevent['LOCATION']) $event->location = $icalevent['LOCATION'];
+
$event->date_start_in_calendar = $event->datep;
if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 7ed5fe6e919..cb63f14ab63 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -210,6 +210,7 @@ if (empty($reshook))
$search_total_ht = '';
$search_total_vat = '';
$search_total_ttc = '';
+ $search_warehouse = '';
$search_multicurrency_code = '';
$search_multicurrency_tx = '';
$search_multicurrency_montant_ht = '';
@@ -1124,7 +1125,7 @@ if ($resql)
if (!empty($arrayfields['typent.code']['checked']))
{
print '';
- if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+ if (empty($typenArray)) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print ' | ';
if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index eeb51e65442..97ae42c3122 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1527,6 +1527,29 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print "";
+ //Select mail models is same action as presend
+ if (GETPOST('modelselected')) {
+ $action = 'presend';
+ }
+
+ if ($action != 'presend')
+ {
+ print '';
+
+ print ' ';
+
+ $MAXEVENT = 10;
+
+ $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id);
+
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'contact', $object->socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
+
+ print ' |