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

Merge log with events tabs

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-08 14:28:49 +02:00
parent cefc373a5f
commit 1b04eabf1f
11 changed files with 141 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -23,12 +23,6 @@
"restler/framework": "^3.0",
"tecnickcom/tcpdf": "6.2.12"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0",
"jakub-onderka/php-console-highlighter": "^0",
"phpunit/phpunit": "^4",
"squizlabs/php_codesniffer": "^2"
},
"suggest": {
"ext-mysqlnd": "To use with MySQL or MariaDB",
"ext-mysqli": "To use with MySQL or MariaDB",

5
htdocs/admin/security_file.php
View File

@ -114,9 +114,8 @@ llxHeader('',$langs->trans("Files"),$wikihelp);
print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
//print $langs->trans("FilesDesc")."<br>\n";
//print "<br>\n";
print $langs->trans("SecurityFilesDesc")."<br>\n";
print "<br>\n";
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';

4
htdocs/commande/card.php
View File

@ -1953,7 +1953,7 @@ if ($action == 'create' && $user->rights->commande->creer)
$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
// Ref
print '<tr><td width="18%">' . $langs->trans('Ref') . '</td>';
print '<tr><td class="titlefield">' . $langs->trans('Ref') . '</td>';
print '<td colspan="3">';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
print '</td>';
@ -1993,7 +1993,7 @@ if ($action == 'create' && $user->rights->commande->creer)
if ($action == 'editthirdparty') {
$form->form_thirdparty($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, 'socid','client>0');
} else {
print ' &nbsp;' . $soc->getNomUrl(1, 'compta');
print $soc->getNomUrl(1, 'compta');
}
print '</tr>';

2
htdocs/commande/contact.php
View File

@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref))
$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
// Ref
print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
print "</td></tr>";

21
htdocs/core/lib/company.lib.php
View File

@ -84,13 +84,6 @@ function societe_prepare_head(Societe $object)
$h++;
}
if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
{
$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Agenda");
$head[$h][2] = 'agenda';
$h++;
}
if (! empty($conf->projet->enabled) && (!empty($user->rights->projet->lire) ))
{
$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
@ -189,11 +182,21 @@ function societe_prepare_head(Societe $object)
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
{
$head[$h][1] = $langs->trans("Events");
$head[$h][1].= ' / ';
}
$head[$h][1].= $langs->trans("Info");
$head[$h][2] = 'agenda';
$h++;
// Log
$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
/*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
$h++;*/
complete_head_from_modules($conf,$langs,$object,$head,$h,'thirdparty','remove');

128
htdocs/core/lib/functions2.lib.php
View File

@ -203,9 +203,10 @@ function dol_print_file($langs,$filename,$searchalt=0)
* TODO Move this into html.formother
*
* @param object $object Objet to show
* @param int $usetable Output into a table
* @return void
*/
function dol_print_object_info($object)
function dol_print_object_info($object, $usetable=0)
{
global $langs,$db;
$langs->load("other");
@ -219,14 +220,27 @@ function dol_print_object_info($object)
$deltadateforuser=round($deltadateforclient-$deltadateforserver);
//print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
if ($usetable) print '<table class="border centpercent">';
// Import key
if (! empty($object->import_key))
print $langs->trans("ImportedWithSet").': '.$object->import_key.'<br>';
{
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("ImportedWithSet");
if ($usetable) print '</td><td>';
else print ': ';
print $object->import_key;
if ($usetable) print '</td></tr>';
else print '<br>';
}
// User creation
if (! empty($object->user_creation))
{
print $langs->trans("CreatedBy").': ';
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("CreatedBy");
if ($usetable) print '</td><td>';
else print ': ';
if (is_object($object->user_creation))
{
if ($object->user_creation->id) print $object->user_creation->getNomUrl(1);
@ -239,21 +253,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date creation
if (! empty($object->date_creation))
{
print $langs->trans("DateCreation").': '.dol_print_date($object->date_creation, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateCreation");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_creation, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// User change
if (! empty($object->user_modification))
{
print $langs->trans("ModifiedBy").': ';
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("ModifiedBy");
if ($usetable) print '</td><td>';
else print ': ';
if (is_object($object->user_modification))
{
if ($object->user_modification->id) print $object->user_modification->getNomUrl(1);
@ -266,21 +289,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date change
if (! empty($object->date_modification))
{
print $langs->trans("DateLastModification").': '.dol_print_date($object->date_modification, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateLastModification");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_modification, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// User validation
if (! empty($object->user_validation))
{
print $langs->trans("ValidatedBy").': ';
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("ValidatedBy");
if ($usetable) print '</td><td>';
else print ': ';
if (is_object($object->user_validation))
{
if ($object->user_validation->id) print $object->user_validation->getNomUrl(1);
@ -293,21 +325,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date validation
if (! empty($object->date_validation))
{
print $langs->trans("DateValidation").': '.dol_print_date($object->date_validation, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateValidation");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_validation, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// User approve
if (! empty($object->user_approve))
{
print $langs->trans("ApprovedBy").': ';
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("ApprovedBy");
if ($usetable) print '</td><td>';
else print ': ';
if (is_object($object->user_approve))
{
if ($object->user_approve->id) print $object->user_approve->getNomUrl(1);
@ -320,21 +361,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date approve
if (! empty($object->date_approve))
{
print $langs->trans("DateApprove").': '.dol_print_date($object->date_approve, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateApprove");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_approve, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// User close
if (! empty($object->user_cloture))
{
print $langs->trans("ClosedBy").': ';
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("ClosedBy");
if ($usetable) print '</td><td>';
else print ': ';
if (is_object($object->user_cloture))
{
if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1);
@ -347,21 +397,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date close
if (! empty($object->date_cloture))
{
print $langs->trans("DateClosing").': '.dol_print_date($object->date_cloture, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateClosing");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_cloture, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// User conciliate
if (! empty($object->user_rappro))
{
print $langs->trans("ConciliatedBy").': ';
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("ConciliatedBy");
if ($usetable) print '</td><td>';
else print ': ';
if (is_object($object->user_rappro))
{
if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1);
@ -374,24 +433,37 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date conciliate
if (! empty($object->date_rappro))
{
print $langs->trans("DateConciliating").': '.dol_print_date($object->date_rappro, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateConciliating");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_rappro, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
// Date send
if (! empty($object->date_envoi))
{
print $langs->trans("DateLastSend").': '.dol_print_date($object->date_envoi, 'dayhour');
if ($usetable) print '<tr><td class="titlefield">';
print $langs->trans("DateLastSend");
if ($usetable) print '</td><td>';
else print ': ';
print dol_print_date($object->date_envoi, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
if ($usetable) print '</td></tr>';
else print '<br>';
}
if ($usetable) print '</table>';
}

2
htdocs/core/modules/modAgenda.class.php
View File

@ -53,7 +53,7 @@ class modAgenda extends DolibarrModules
$this->module_position = 15;
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i','',get_class($this));
$this->description = "Gestion de l'agenda et des actions";
$this->description = "Follow events or rendez-vous. Record manual events into Agendas or let application record automatic events for log tracking.";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);

2
htdocs/expedition/shipment.php
View File

@ -198,7 +198,7 @@ if ($id > 0 || ! empty($ref))
print '<table class="border" width="100%">';
// Ref
print '<tr><td width="18%">'.$langs->trans('Ref').'</td>';
print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
print '<td colspan="3">';
print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';

5
htdocs/langs/en_US/admin.lang
View File

@ -45,6 +45,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
SecuritySetup=Security setup
SecurityFilesDesc=Define here options related to security about uploading files.
ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
@ -524,8 +525,8 @@ Module2200Name=Dynamic Prices
Module2200Desc=Enable the usage of math expressions for prices
Module2300Name=Cron
Module2300Desc=Scheduled job management
Module2400Name=Agenda
Module2400Desc=Events/tasks and agenda management
Module2400Name=Agenda/Events
Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
Module2500Name=Electronic Content Management
Module2500Desc=Save and share documents
Module2600Name=API/Web services (SOAP server)

23
htdocs/societe/agenda.php
View File

@ -30,6 +30,7 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$langs->load("companies");
@ -117,6 +118,12 @@ if ($socid)
print '</table>';
print '<br>';
$object->info($socid);
print dol_print_object_info($object, 1);
print '</div>';
dol_fiche_end();
@ -158,16 +165,18 @@ if ($socid)
print '</div>';
print '<br>';
if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
{
print '<br>';
print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
// List of todo actions
show_actions_todo($conf,$langs,$db,$object,null,0,1);
// List of todo actions
show_actions_todo($conf,$langs,$db,$object,null,0,1);
// List of done actions
show_actions_done($conf,$langs,$db,$object);
// List of done actions
show_actions_done($conf,$langs,$db,$object);
}
}

106
htdocs/societe/info.php
View File

@ -1,106 +0,0 @@
<?php
/* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/societe/info.php
* \ingroup societe
* \brief Page des informations d'une societe
*/
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$langs->load("companies");
$langs->load("other");
if (! empty($conf->notification->enabled)) $langs->load("mails");
// Security check
$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe', $socid, '&societe');
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('infothirdparty'));
$object = new Societe($db);
/*
* Actions
*/
$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');
/*
* View
*/
$form=new Form($b);
$title=$langs->trans("ThirdParty");
if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Info");
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$title,$help_url);
if ($socid > 0)
{
$result = $object->fetch($socid);
if (! $result)
{
$langs->load("errors");
print $langs->trans("ErrorRecordNotFound");
llxFooter();
$db->close();
exit;
}
$head = societe_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("ThirdParty"), 0, 'company');
dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
$object->info($socid);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<br>';
dol_print_object_info($object);
print '</div>';
dol_fiche_end();
}
llxFooter();
$db->close();