diff --git a/ChangeLog b/ChangeLog
index 727b8952d9ccfe95fb4731dec55ff67aaaa20b1a..ab5fa93f635ac17695254d599dea0ba734eea116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@ Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a projec
Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" error
+Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selected by the UI
+Fix: [ bug #2861 ] Undefined variable $res when migrating
+Fix: [ bug #2837 ] Product list table column header does not match column body
+Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order
Fix: [ bug #2814 ] JPEG photos are not displayed in Product photos page
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 07541732bb081feee1b85bbbcb0d2806cd4cf3f2..a38e5a3e8a7e097c54f6350bc75f26c0c0b59468 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copytight (C) 2005-2015 Regis Houssin <regis.houssin@capnetworks.com>
* Copytight (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
@@ -180,7 +180,7 @@ print $form->select_comptes($account_to,'account_to',0,'',1);
print "</td>\n";
print "<td>";
-$form->select_date($dateo,'','','','','add');
+$form->select_date((! empty($dateo)?$dateo:''),'','','','','add');
print "</td>\n";
print '<td><input name="label" class="flat" type="text" size="40" value="'.$label.'"></td>';
print '<td><input name="amount" class="flat" type="text" size="8" value="'.$amount.'"></td>';
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 13c30976a988145443b7472d90ec0eb9acc93a91..5cc810cc83f4615b41e9edc704e356b352b78232 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -39,7 +39,7 @@
*/
function report_header($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='')
{
- global $langs, $hselected;
+ global $langs;
print "\n\n<!-- debut cartouche rapport -->\n";
@@ -48,7 +48,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
$head[$h][1] = $langs->trans("Report");
$head[$h][2] = 'report';
- dol_fiche_head($head, $hselected);
+ dol_fiche_head($head, 'report');
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
foreach($moreparam as $key => $value)
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 2bcb244690e3bc8557599ccd8e1eeb9a5198327e..59f1864837c3bc8e202eeca019f990637a92ab26 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3661,8 +3661,8 @@ function migrate_reload_modules($db,$langs,$conf)
if (! empty($conf->global->MAIN_MODULE_SERVICE)) // Permission has changed into 2.7
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
- if ($res) {
- $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
+ $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
+ if ($res) {
$mod=new modService($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
@@ -3671,8 +3671,8 @@ function migrate_reload_modules($db,$langs,$conf)
if (! empty($conf->global->MAIN_MODULE_COMMANDE)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
- if ($res) {
- $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
+ $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
+ if ($res) {
$mod=new modCommande($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
@@ -3681,8 +3681,8 @@ function migrate_reload_modules($db,$langs,$conf)
if (! empty($conf->global->MAIN_MODULE_FACTURE)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
- if ($res) {
- $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
+ $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
+ if ($res) {
$mod=new modFacture($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
@@ -3732,8 +3732,8 @@ function migrate_reload_modules($db,$langs,$conf)
if (! empty($conf->global->MAIN_MODULE_ECM)) // Permission has changed into 3.0 and 3.1
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
- if ($res) {
- $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
+ $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
+ if ($res) {
$mod=new modECM($db);
$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init('newboxdefonly');
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 28563edc5eb6cf0d03977081948e1a5bb5bbb31d..c25ff6bbf7f57a0ef2e270f8fcc93848f8d08e6e 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -459,7 +459,7 @@ else
}
// Better buy price
- if ($user->rights->produit->creer) {
+ if ($user->rights->fournisseur->lire) {
print '<td align="right">';
if ($objp->minsellprice != '')
{
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 0a245093057575edded4a79f33e2d4a6dcd8b926..f53833b45d7aac2af022ffeca3b5f8aba6e21da8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -670,7 +670,7 @@ $sql.= " WHERE fk_product = ".$object->id;
$sql.= " AND p.entity IN (".getEntity('productprice', 1).")";
$sql.= " AND p.fk_user_author = u.rowid";
if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql.= " AND p.price_level = ".$soc->price_level;
-$sql.= " ORDER BY p.date_price DESC, p.price_level ASC";
+$sql.= " ORDER BY p.date_price DESC, p.price_level ASC, p.rowid DESC";
dol_syslog("sql=".$sql);
$result = $db->query($sql);