diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 11296bda93e..5fb1d638a88 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2015 Juanjo Menent * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Raphaël Doursenaud * * 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 @@ -606,7 +607,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) $chargestatic->lib=$obj->libelle; $chargestatic->paye=$obj->paye; print ''.$chargestatic->getNomUrl(1).''; - print ''.dol_print_date($obj->date_ech,'day').''; + print ''.dol_print_date($db->jdate($obj->date_ech),'day').''; print ''.price($obj->amount).''; print ''.price($obj->sumpaid).''; print ''.$chargestatic->getLibStatut(3).''; @@ -966,7 +967,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print "".dol_print_date($obj->da,"day").""; + print "".dol_print_date($db->jdate($obj->da),"day").""; print ''.$obj->libelle.' '.$obj->label.''; $i++; } diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index b3f2144b28b..3895a27a9f1 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -155,7 +155,6 @@ class box_prospect extends ModeleBoxes ); } } else { - dol_syslog("box_prospect::loadBox not allowed de read this box content",LOG_ERR); $this->info_box_contents[0][0] = array( 'td' => 'align="left"', 'text' => $langs->trans("ReadPermissionNotAllowed"), diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php index 9ea39caaf50..4093b89d434 100644 --- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php @@ -51,7 +51,9 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface global $conf; try { - if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) $conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH='/usr/share/php'; + if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) { + $conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH=DOL_DOCUMENT_ROOT . '/includes/chromephp/'; + } set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH); //print 'rrrrr'.get_include_path(); @@ -86,9 +88,9 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface array( 'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'), 'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH', - 'default' => '/usr/share/php', + 'default' => DOL_DOCUMENT_ROOT . '/includes/chromephp/', 'attr' => 'size="60"', - 'example' => DOL_DOCUMENT_ROOT.'/includes/chromephp' + 'example' =>'/usr/share/php' ) ); } diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 3cd39d4101f..79c241a9d7e 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -50,9 +50,9 @@ $pagenext = $page + 1; $startdate=$enddate=''; if (!empty($_POST['startdatemonth'])) - $startdate = dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); + $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); if (!empty($_POST['enddatemonth'])) - $enddate = dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); + $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); /* * View diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index b9bd6e5099d..07d4a75a522 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -72,9 +72,9 @@ $pagenext = $page + 1; $startdate=$enddate=''; if (!empty($_POST['startdatemonth'])) - $startdate = dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); + $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); if (!empty($_POST['enddatemonth'])) - $enddate = dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); + $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); /*