NEW(propal): Add messaging and agenda features to proposals (#34883)
This commit is contained in:
parent
13767a614d
commit
49a6995fa1
12 changed files with 571 additions and 297 deletions
|
|
@ -23,12 +23,12 @@
|
|||
* \brief Tab of events on Proposal
|
||||
*/
|
||||
require '../../main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/propal.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
|
||||
|
||||
/**
|
||||
* @var Conf $conf
|
||||
|
|
@ -46,7 +46,7 @@ $id = GETPOSTINT('id');
|
|||
$ref = GETPOST('ref', 'alpha');
|
||||
$action = GETPOST('action', 'aZ09');
|
||||
$cancel = GETPOST('cancel', 'aZ09');
|
||||
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
|
||||
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search
|
||||
$backtopage = GETPOST('backtopage', 'alpha');
|
||||
|
||||
if (GETPOST('actioncode', 'array')) {
|
||||
|
|
@ -81,15 +81,15 @@ if (!$sortorder) {
|
|||
// Initialize a technical objects
|
||||
$object = new Propal($db);
|
||||
$extrafields = new ExtraFields($db);
|
||||
$diroutputmassaction = $conf->propal->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
|
||||
$diroutputmassaction = $conf->propal->multidir_output[$conf->entity] . '/temp/massgeneration/' . $user->id;
|
||||
$hookmanager->initHooks(array('propalagenda', 'globalcard')); // Note that conf->hooks_modules contains array
|
||||
// Fetch optionals attributes and labels
|
||||
$extrafields->fetch_name_optionals_label($object->table_element);
|
||||
|
||||
// Load object
|
||||
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals
|
||||
include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals
|
||||
if ($id > 0 || !empty($ref)) {
|
||||
$upload_dir = $conf->propal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
|
||||
$upload_dir = $conf->propal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity] . "/" . $object->id;
|
||||
}
|
||||
|
||||
$permissiontoread = $user->hasRight("propal", "lire");
|
||||
|
|
@ -116,7 +116,7 @@ if ($reshook < 0) {
|
|||
if (empty($reshook)) {
|
||||
// Cancel
|
||||
if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
|
||||
header("Location: ".$backtopage);
|
||||
header("Location: " . $backtopage);
|
||||
exit;
|
||||
}
|
||||
|
||||
|
|
@ -150,14 +150,14 @@ if ($object->id > 0) {
|
|||
|
||||
// Object card
|
||||
// ------------------------------------------------------------
|
||||
$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
|
||||
$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
|
||||
|
||||
$morehtmlref = '<div class="refidno">';
|
||||
// Ref customer
|
||||
$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
|
||||
$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
|
||||
// Thirdparty
|
||||
$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
|
||||
$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1);
|
||||
// Project
|
||||
if (isModEnabled('project')) {
|
||||
$langs->load("projects");
|
||||
|
|
@ -165,16 +165,16 @@ if ($object->id > 0) {
|
|||
if (0) {
|
||||
$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
|
||||
if ($action != 'classify') {
|
||||
$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
|
||||
$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
|
||||
}
|
||||
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
|
||||
$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
|
||||
} else {
|
||||
if (!empty($object->fk_project)) {
|
||||
$proj = new Project($db);
|
||||
$proj->fetch($object->fk_project);
|
||||
$morehtmlref .= $proj->getNomUrl(1);
|
||||
if ($proj->title) {
|
||||
$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
|
||||
$morehtmlref .= '<span class="opacitymedium"> - ' . dol_escape_htmltag($proj->title) . '</span>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -201,16 +201,16 @@ if ($object->id > 0) {
|
|||
$objthirdparty = $object;
|
||||
$objcon = new stdClass();
|
||||
|
||||
$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
|
||||
$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
|
||||
$out .= '&backtopage='.urlencode($urlbacktopage);
|
||||
$out = '&origin=' . urlencode((string) ($object->element . (property_exists($object, 'module') ? '@' . $object->module : ''))) . '&originid=' . urlencode((string) ($object->id));
|
||||
$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
|
||||
$out .= '&backtopage=' . urlencode($urlbacktopage);
|
||||
$permok = $user->hasRight('agenda', 'myactions', 'create');
|
||||
if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
|
||||
//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
|
||||
if (get_class($objthirdparty) == 'Societe') {
|
||||
$out .= '&socid='.urlencode((string) ($objthirdparty->id));
|
||||
$out .= '&socid=' . urlencode((string) ($objthirdparty->id));
|
||||
}
|
||||
$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
|
||||
$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
|
||||
//$out.=$langs->trans("AddAnAction").' ';
|
||||
//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
|
||||
//$out.="</a>";
|
||||
|
|
@ -218,16 +218,24 @@ if ($object->id > 0) {
|
|||
|
||||
$morehtmlright = '';
|
||||
|
||||
|
||||
//$messagingUrl = DOL_URL_ROOT.'/societe/messaging.php?socid='.$object->id;
|
||||
//$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
|
||||
//$messagingUrl = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
|
||||
//$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
|
||||
|
||||
$messagingUrl = DOL_URL_ROOT . '/comm/propal/messaging.php?id=' . $object->id;
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
|
||||
|
||||
$messagingUrl = DOL_URL_ROOT . '/comm/propal/agenda.php?id=' . $object->id;
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
|
||||
|
||||
|
||||
if (isModEnabled('agenda')) {
|
||||
if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out);
|
||||
} else {
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', 0);
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out, '', 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -235,20 +243,22 @@ if ($object->id > 0) {
|
|||
if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
|
||||
print '<br>';
|
||||
|
||||
$param = '&id='.$object->id.(!empty($socid) ? '&socid='.$socid : '');
|
||||
|
||||
|
||||
$param = '&id=' . $object->id . (!empty($socid) ? '&socid=' . $socid : '');
|
||||
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
||||
$param .= '&contextpage='.urlencode($contextpage);
|
||||
$param .= '&contextpage=' . urlencode($contextpage);
|
||||
}
|
||||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||
$param .= '&limit='.((int) $limit);
|
||||
$param .= '&limit=' . ((int) $limit);
|
||||
}
|
||||
|
||||
// Try to know count of actioncomm from cache
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
|
||||
$cachekey = 'count_events_propal_'.$object->id;
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
|
||||
$cachekey = 'count_events_propal_' . $object->id;
|
||||
$nbEvent = dol_getcache($cachekey);
|
||||
|
||||
print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
|
||||
print_barre_liste($langs->trans("ActionsOnPropal") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
|
||||
//print_barre_liste($langs->trans("ActionsOnPropal"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
|
||||
|
||||
// List of all actions
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
256
htdocs/comm/propal/messaging.php
Normal file
256
htdocs/comm/propal/messaging.php
Normal file
|
|
@ -0,0 +1,256 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Grimal Valentin <valentin.grimal@pichinov.com>
|
||||
*
|
||||
* 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 <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/comm/propal/messaging.php
|
||||
* \ingroup order
|
||||
* \brief Page with events on order
|
||||
*/
|
||||
|
||||
// Load Dolibarr environment
|
||||
require '../../main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/propal.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
|
||||
|
||||
/**
|
||||
* @var Conf $conf
|
||||
* @var DoliDB $db
|
||||
* @var HookManager $hookmanager
|
||||
* @var Translate $langs
|
||||
* @var User $user
|
||||
*/
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->load("orders"); // Changed from projects
|
||||
|
||||
$id = GETPOSTINT('id');
|
||||
$ref = GETPOST('ref', 'alpha');
|
||||
$socid = GETPOSTINT('socid');
|
||||
$action = GETPOST('action', 'aZ09');
|
||||
$contextpage = GETPOST('contextpage', 'aZ09');
|
||||
|
||||
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
||||
$sortfield = GETPOST("sortfield", "aZ09comma");
|
||||
$sortorder = GETPOST("sortorder", 'aZ09comma');
|
||||
$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
|
||||
$page = is_numeric($page) ? $page : 0;
|
||||
$page = $page == -1 ? 0 : $page;
|
||||
if (!$sortfield) {
|
||||
$sortfield = "a.datep,a.id";
|
||||
}
|
||||
if (!$sortorder) {
|
||||
$sortorder = "DESC";
|
||||
}
|
||||
$offset = $limit * $page;
|
||||
$pageprev = $page - 1;
|
||||
$pagenext = $page + 1;
|
||||
|
||||
if (GETPOST('actioncode', 'array')) {
|
||||
$actioncode = GETPOST('actioncode', 'array', 3);
|
||||
if (!count($actioncode)) {
|
||||
$actioncode = '0';
|
||||
}
|
||||
} else {
|
||||
$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
|
||||
}
|
||||
$search_rowid = GETPOST('search_rowid');
|
||||
$search_agenda_label = GETPOST('search_agenda_label');
|
||||
|
||||
$hookmanager->initHooks(array('ordercardinfo')); // Changed from projectcardinfo
|
||||
|
||||
// Security check
|
||||
$id = GETPOSTINT("id");
|
||||
$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 order and assignment.
|
||||
$result = restrictedArea($user, 'propal', $id, 'propal&propal'); // Changed from projet and project
|
||||
|
||||
if (!$user->hasRight('propal', 'lire')) { // Changed from projet
|
||||
accessforbidden();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Actions
|
||||
*/
|
||||
|
||||
$object = new Propal($db); // Changed from Project
|
||||
|
||||
if ($id > 0 || !empty($ref)) {
|
||||
$object->fetch($id, $ref);
|
||||
$object->fetch_thirdparty();
|
||||
// if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
|
||||
// $object->fetchComments();
|
||||
// }
|
||||
$object->info($object->id);
|
||||
}
|
||||
|
||||
$parameters = array('id' => $socid);
|
||||
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
|
||||
if ($reshook < 0) {
|
||||
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
|
||||
}
|
||||
|
||||
// Purge search criteria
|
||||
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
|
||||
$actioncode = '';
|
||||
$search_agenda_label = '';
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$form = new Form($db);
|
||||
$agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/' . $langs->trans("Agenda") : '';
|
||||
$title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Removed $object->name as orders typically don't have it
|
||||
if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE'))) { // Changed from projectnameonly
|
||||
$title = $object->ref . ' - ' . $langs->trans("Info"); // Simplified title
|
||||
}
|
||||
$help_url = "EN:Module_Orders|FR:Module_Propals|ES:Módulo_Pedidos"; // Changed help URL
|
||||
llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_messaging'); // Changed mod-project
|
||||
|
||||
$head = propal_prepare_head($object); // Changed from project_prepare_head
|
||||
|
||||
print dol_get_fiche_head($head, 'agenda', $langs->trans("Order"), -1, 'order'); // Changed "Project" and "projectpub"
|
||||
|
||||
|
||||
// Order card
|
||||
|
||||
if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['order'])) { // Changed from project
|
||||
$tmpurl = $_SESSION['pageforbacktolist']['order']; // Changed from project
|
||||
$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
|
||||
$linkback = '<a href="' . $tmpurl . (preg_match('/\?/', $tmpurl) ? '&' : '?') . 'restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
|
||||
} else {
|
||||
$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; // Changed from projet
|
||||
}
|
||||
|
||||
$morehtmlref = '<div class="refidno">';
|
||||
// Title
|
||||
$morehtmlref .= $object->ref; // Changed from $object->title as orders typically use ref for main identification
|
||||
// Thirdparty
|
||||
if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
|
||||
$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'order');
|
||||
}
|
||||
$morehtmlref .= '</div>';
|
||||
|
||||
// Define a complementary filter for search of next/prev ref.
|
||||
if (!$user->hasRight('propal', 'all', 'lire')) { // Changed from projet
|
||||
// This part needs a function specific to orders, e.g., getOrdersAuthorizedForUser
|
||||
// $objectsListId = $object->getOrdersAuthorizedForUser($user, 0, 0); // Assuming such a method exists or will be created
|
||||
// $object->next_prev_filter = "rowid:IN:".$db->sanitize(count($objectsListId) ? implode(',', array_keys($objectsListId)) : '0');
|
||||
$object->next_prev_filter = ''; // Placeholder if getOrdersAuthorizedForUser is not available
|
||||
}
|
||||
|
||||
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
|
||||
|
||||
|
||||
print '<div class="fichecenter">';
|
||||
print '<div class="underbanner clearboth"></div>';
|
||||
|
||||
dol_print_object_info($object, 1);
|
||||
|
||||
print '</div>';
|
||||
|
||||
print '<div class="clearboth"></div>';
|
||||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
|
||||
// Actions buttons
|
||||
|
||||
$out = '';
|
||||
$permok = $user->hasRight('agenda', 'myactions', 'create');
|
||||
if ($permok) {
|
||||
$out .= '&orderid=' . $object->id; // Changed from projectid
|
||||
}
|
||||
|
||||
|
||||
|
||||
//print '</div>';
|
||||
|
||||
if (!empty($object->id)) {
|
||||
print '<br>';
|
||||
|
||||
//print '<div class="tabsAction">';
|
||||
$morehtmlright = '';
|
||||
|
||||
|
||||
// Show link to change view in message
|
||||
$messagingUrl = DOL_URL_ROOT . '/comm/propal/messaging.php?id=' . $object->id; // Changed from projet
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 2);
|
||||
|
||||
// Show link to change view in agenda
|
||||
$messagingUrl = DOL_URL_ROOT . '/comm/propal/agenda.php?id=' . $object->id; // Changed from projet
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1);
|
||||
|
||||
|
||||
// // Show link to send an email (if read and not closed)
|
||||
// $btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
|
||||
// $url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init&private_message=0&send_email=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?track_id='.$object->track_id).'#formmailbeforetitle';
|
||||
// $morehtmlright .= dolGetButtonTitle($langs->trans('SendMail'), '', 'fa fa-paper-plane', $url, 'email-title-button', $btnstatus);
|
||||
|
||||
// // Show link to add a private message (if read and not closed)
|
||||
// $btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
|
||||
// $url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init&backtopage='.urlencode($_SERVER["PHP_SELF"].'?track_id='.$object->track_id).'#formmailbeforetitle';
|
||||
// $morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
|
||||
|
||||
// Show link to add event
|
||||
if (isModEnabled('agenda')) {
|
||||
$addActionBtnRight = $user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create');
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '&socid=' . $object->socid . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id), '', (int) $addActionBtnRight);
|
||||
}
|
||||
|
||||
$param = '&id=' . $object->id;
|
||||
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
||||
$param .= '&contextpage=' . urlencode($contextpage);
|
||||
}
|
||||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||
$param .= '&limit=' . ((int) $limit);
|
||||
}
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
|
||||
$cachekey = 'count_events_order_' . $object->id; // Changed from project
|
||||
$nbEvent = dol_getcache($cachekey);
|
||||
|
||||
$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''); // Changed from ActionsOnProject
|
||||
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||
$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
|
||||
}
|
||||
|
||||
print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
|
||||
|
||||
// List of all actions
|
||||
$filters = array();
|
||||
$filters['search_agenda_label'] = $search_agenda_label;
|
||||
$filters['search_rowid'] = $search_rowid;
|
||||
|
||||
// This function needs to be able to handle an 'order' object. You might need to adapt it or create a new one.
|
||||
show_actions_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
|
||||
}
|
||||
|
||||
// End of page
|
||||
llxFooter();
|
||||
$db->close();
|
||||
|
|
@ -26,7 +26,6 @@
|
|||
*/
|
||||
|
||||
// Load Dolibarr environment
|
||||
//MODIF VAL
|
||||
require '../main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; // Added for contact object
|
||||
|
|
@ -219,7 +218,6 @@ if (!empty($object->id)) {
|
|||
//print '<div class="tabsAction">';
|
||||
$morehtmlright = '';
|
||||
|
||||
//MODIF PICHINOV MESSAGING
|
||||
// Show link to change view in message
|
||||
$messagingUrl = DOL_URL_ROOT . '/commande/messaging.php?id=' . $object->id; // Changed from projet
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1); // Status 1 for "not current page"
|
||||
|
|
@ -229,8 +227,6 @@ if (!empty($object->id)) {
|
|||
$messagingUrl = DOL_URL_ROOT . '/commande/agenda.php?id=' . $object->id; // Changed from projet
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2); // Status 2 for "current page"
|
||||
|
||||
//END MODIF
|
||||
|
||||
// Show link to add event
|
||||
if (isModEnabled('agenda')) {
|
||||
$addActionBtnRight = $user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create');
|
||||
|
|
|
|||
|
|
@ -3681,7 +3681,6 @@ if ($action == 'create' && $usercancreate) {
|
|||
|
||||
$MAXEVENT = 10;
|
||||
|
||||
//MODIF PICHINOV MESSAGING
|
||||
//button to go to messaging from the events box
|
||||
$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT . '/commande/messaging.php?id=' . $object->id);
|
||||
$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT . '/commande/agenda.php?id=' . $object->id);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Grimal Valentin <valentin.grimal@pichinov.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -152,7 +153,7 @@ $morehtmlref = '<div class="refidno">';
|
|||
$morehtmlref .= $object->ref; // Changed from $object->title as orders typically use ref for main identification
|
||||
// Thirdparty
|
||||
if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
|
||||
$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'order'); // Changed from project
|
||||
$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'order');
|
||||
}
|
||||
$morehtmlref .= '</div>';
|
||||
|
||||
|
|
|
|||
|
|
@ -1903,8 +1903,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
|
|||
$sql .= ", o.ref";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
|
||||
$sql .= ", o.ref";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') { //MODIF PICHINOV MESSAGING
|
||||
$sql .= ", s.ref"; //END MODIF
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
|
||||
$sql .= ", s.ref";
|
||||
} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && $filterobj->table_element && $filterobj->element) {
|
||||
if (!empty($filterobj->fields['ref'])) {
|
||||
$sql .= ", o.ref";
|
||||
|
|
@ -1964,9 +1964,11 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
|
|||
$sql .= ", " . MAIN_DB_PREFIX . "bom_bom as o";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
|
||||
$sql .= ", " . MAIN_DB_PREFIX . "contrat as o";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') { //MODIF PICHINOV MESSAGING
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expedition as s ON a.fk_element = s.rowid AND a.elementtype = 'shipping'"; // Jointure sur la table des expéditions avec condition ON
|
||||
} elseif ( //END MODIF
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Propal') {
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "propal as o ON a.fk_element = o.rowid AND a.elementtype = 'propal'";
|
||||
} elseif (
|
||||
is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])
|
||||
&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre']))) // @phan-suppress-current-line PhanTypeInvalidDimOffset
|
||||
&& $filterobj->table_element && $filterobj->element
|
||||
|
|
@ -2027,12 +2029,12 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
|
|||
if ($filterobj->id) {
|
||||
$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
|
||||
}
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') { //MODIF PICHINOV MESSAGING
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
|
||||
$sql .= " AND a.fk_element = s.rowid AND a.elementtype = 'shipping'"; //expedition filter
|
||||
if ($filterobj->id) {
|
||||
$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
|
||||
}
|
||||
} elseif ( //END MODIF
|
||||
} elseif (
|
||||
is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])
|
||||
&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre']))) // ref, titre, label do not exist on $fields - @phan-suppress-current-line PhanTypeInvalidDimOffset
|
||||
&& $filterobj->table_element && $filterobj->element
|
||||
|
|
|
|||
|
|
@ -8506,8 +8506,8 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
|
|||
|
||||
// If the (seller country = buyer country) then the default VAT = VAT of the product sold. End of rule.
|
||||
if (($seller_country_code == $buyer_country_code)
|
||||
|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))
|
||||
|| (in_array($seller_country_code, array('MQ', 'GP')) && in_array($buyer_country_code, array('MQ', 'GP'))) // We should be able to manage the case of MQ, GP, ... with a deicated vat rate at previous step.
|
||||
|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))
|
||||
|| (in_array($seller_country_code, array('MQ', 'GP')) && in_array($buyer_country_code, array('MQ', 'GP'))) // We should be able to manage the case of MQ, GP, ... with a deicated vat rate at previous step.
|
||||
) { // Warning ->country_code not always defined
|
||||
//print 'VATRULE 3';
|
||||
$tmpvat = get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
|
||||
|
|
@ -12428,7 +12428,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
|
|||
$reg = array();
|
||||
if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {
|
||||
if (count($values) !== 6) {
|
||||
dol_syslog('Tabs module_parts entries must be composed of 6 values separated by ":", but got "'.$value.'". Please check your module descriptor classes.', LOG_ERR);
|
||||
dol_syslog('Tabs module_parts entries must be composed of 6 values separated by ":", but got "' . $value . '". Please check your module descriptor classes.', LOG_ERR);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -12494,7 +12494,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
|
|||
// @phan-suppress-next-line PhanPluginUnknownObjectMethodCall
|
||||
$nbrec = $obj->$function($object->id, $obj);
|
||||
if (!empty($nbrec)) {
|
||||
$label .= '<span class="badge marginleftonlyshort">'.$nbrec.'</span>';
|
||||
$label .= '<span class="badge marginleftonlyshort">' . $nbrec . '</span>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -15723,10 +15723,8 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
|
|||
$sql .= ", sp.lastname, sp.firstname";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
|
||||
$sql .= ", m.lastname, m.firstname";
|
||||
} elseif (is_object($filterobj) && in_array(get_class($filterobj), array('Commande', 'CommandeFournisseur', 'Product', 'Ticket', 'BOM', 'Contrat', 'Facture', 'FactureFournisseur'))) {
|
||||
} elseif (is_object($filterobj) && in_array(get_class($filterobj), array('Commande', 'CommandeFournisseur', 'Product', 'Ticket', 'BOM', 'Contrat', 'Facture', 'FactureFournisseur', 'Propal', 'Expedition'))) {
|
||||
$sql .= ", o.ref";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') { //MODIF PICHINOV MESSAGING
|
||||
$sql .= ", s.ref"; // Add expedition ref
|
||||
}
|
||||
$sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_action";
|
||||
|
|
@ -15763,11 +15761,13 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
|
|||
$sql .= ", " . MAIN_DB_PREFIX . "facture as o";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'FactureFournisseur') {
|
||||
$sql .= ", " . MAIN_DB_PREFIX . "facture_fourn as o";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Commande') { //MODIF PICHINOV MESSAGING
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "commande as o ON a.fk_element = o.rowid AND a.elementtype = 'order'";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Commande') {
|
||||
$sql .= ", " . MAIN_DB_PREFIX . "commande as o";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expedition as s ON a.fk_element = s.rowid AND a.elementtype = 'shipping'"; // CHANGED: Table 'expedition' et alias 's', elementtype 'shipping'
|
||||
} //END MODIF
|
||||
$sql .= ", " . MAIN_DB_PREFIX . "expedition as o";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Propal') {
|
||||
$sql .= ", " . MAIN_DB_PREFIX . "propal as o";
|
||||
}
|
||||
$sql .= " WHERE a.entity IN (" . getEntity('agenda') . ")";
|
||||
if (!$force_filter_contact) {
|
||||
if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {
|
||||
|
|
@ -15784,11 +15784,16 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
|
|||
if ($filterobj->id) {
|
||||
$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
|
||||
}
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') { //MODIF PICHINOV MESSAGING
|
||||
$sql .= " AND a.fk_element = s.rowid AND a.elementtype = 'shipping'";
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
|
||||
$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'shipping'";
|
||||
if ($filterobj->id) {
|
||||
$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
|
||||
} //END MODIF
|
||||
}
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'Propal') {
|
||||
$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'propal'";
|
||||
if ($filterobj->id) {
|
||||
$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
|
||||
}
|
||||
} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
|
||||
$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
|
||||
if ($filterobj->id) {
|
||||
|
|
@ -16453,6 +16458,8 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
|
|||
}
|
||||
}
|
||||
|
||||
print_r($sql);
|
||||
|
||||
if ($noprint) {
|
||||
return $out;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -114,15 +114,13 @@ function shipping_prepare_head($object)
|
|||
$head[$h][2] = 'note';
|
||||
$h++;
|
||||
|
||||
|
||||
//MODIF PICHINOV AGENDA
|
||||
$head[$h][0] = DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id;
|
||||
$head[$h][1] = $langs->trans("Events");
|
||||
if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
|
||||
$nbEvent = 0;
|
||||
// Enable caching of thirdparty count actioncomm
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
|
||||
$cachekey = 'count_events_expedition_' . $object->id; // CHANGED: 'propal' to 'expedition'
|
||||
$cachekey = 'count_events_expedition_' . $object->id;
|
||||
$dataretrieved = dol_getcache($cachekey);
|
||||
if (!is_null($dataretrieved)) {
|
||||
$nbEvent = $dataretrieved;
|
||||
|
|
@ -130,7 +128,7 @@ function shipping_prepare_head($object)
|
|||
$sql = "SELECT COUNT(id) as nb";
|
||||
$sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm";
|
||||
$sql .= " WHERE fk_element = " . ((int) $object->id);
|
||||
$sql .= " AND elementtype = 'shipping'"; // CHANGED: 'order' to 'shipping'
|
||||
$sql .= " AND elementtype = 'shipping'";
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Grimal Valentin <valentin.grimal@pichinov.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -46,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php'; // Added for
|
|||
*/
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("deliveries", "other")); // Changed from "order" to "deliveries" (common for shipping)
|
||||
$langs->loadLangs(array("deliveries", "other"));
|
||||
|
||||
$id = GETPOSTINT('id');
|
||||
$ref = GETPOST('ref', 'alpha');
|
||||
|
|
@ -203,11 +204,11 @@ if (!empty($object->id)) {
|
|||
|
||||
// Show link to change view in message
|
||||
$messagingUrl = DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id; // Changed from commande
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1); // Status 1 for "not current page"
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
|
||||
|
||||
// Show link to change view in agenda
|
||||
$messagingUrl = DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id; // Changed from commande
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2); // Status 2 for "current page"
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
|
||||
|
||||
|
||||
// Show link to add event
|
||||
|
|
|
|||
|
|
@ -3182,13 +3182,12 @@ if ($action == 'create') {
|
|||
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
|
||||
$formactions = new FormActions($db);
|
||||
|
||||
//MODIF PICHINOV MESSAGING
|
||||
//button to go to messaging from the events box
|
||||
$MAXEVENT = 10;
|
||||
$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id);
|
||||
$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id);
|
||||
|
||||
$somethingshown = $formactions->showactions($object, 'shipping', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter);
|
||||
//END MODIF
|
||||
|
||||
print '</div></div>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 Grimal Valentin <valentin.grimal@pichinov.com>
|
||||
*
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue