From 8d18507d5f73a89319587f30a6f74c7c2e02bc43 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Aug 2015 15:35:25 +0200 Subject: [PATCH 1/5] Bad help --- build/makepack-dolibarr.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c667754d4ab..9db6f3a4da3 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -984,7 +984,7 @@ if ($nboftargetok) { print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; - print "Check that in your Wine setup, you create a Z: drive that point to your /tmp directory.\n"; + print "Check that in your Wine setup, you create a Z: drive that point to your / directory.\n"; $SOURCEBACK=$SOURCE; $SOURCEBACK =~ s/\//\\/g; From 58988d30840e6fc23a2f78e7206cb4abe7691bb5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 14 Aug 2015 16:12:36 +0200 Subject: [PATCH 2/5] 3.5.8 --- htdocs/filefunc.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index bb1a4f6bd3f..33bfa01dcbb 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -29,7 +29,7 @@ * \brief File that include conf.php file and commons lib like functions.lib.php */ -if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.7'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.8'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants From 51d5bff15d761588e96808d1e448c2dfdbf0a874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 31 Aug 2015 19:41:42 +0200 Subject: [PATCH 3/5] Fix #3442 Remove useless syslog Not having the permission to read the box is not an error. Furthermore, no other boxes have this behavior. --- htdocs/core/boxes/box_prospect.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index ec839323174..d3421049e0a 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -119,7 +119,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")); } From 2b6a481011783d38c912b33268d79cc9e62be86e Mon Sep 17 00:00:00 2001 From: fmarcet Date: Tue, 1 Sep 2015 09:46:45 +0200 Subject: [PATCH 4/5] FIX: The hours of date filter aren't correct --- htdocs/margin/customerMargins.php | 4 ++-- htdocs/margin/productMargins.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 34aea94e70f..b1328fbff66 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 b8d5f7f66ba..88b97df78fc 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']); /* From 870882257da72e81848739f3482b22d48a59eb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 1 Sep 2015 10:52:57 +0200 Subject: [PATCH 5/5] Fix #3448 Pass expected date format --- htdocs/compta/index.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index bccf0128b42..327ca731e16 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -1,7 +1,8 @@ - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin +/* Copyright (C) 2001-2005 Rodolphe Quiedeville + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * 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 @@ -685,7 +686,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).''; @@ -1026,7 +1027,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++; }